78 files changed, 329 insertions, 120 deletions
diff --git a/Makefile.am b/Makefile.am
index b0afe91..8455c91 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,6 +52,7 @@ doc:
 
 if EFL_ENABLE_TESTS
 
+
 lcov-reset:
 	@rm -rf $(top_builddir)/coverage
 	@find $(top_builddir) -name "*.gcda" -delete
@@ -65,9 +66,13 @@ lcov-report:
 	@echo "Coverage Report at $(top_builddir)/coverage/html"
 
 check-local:
+if EFL_ENABLE_COVERAGE
 	@$(MAKE) lcov-reset
-	@./src/tests/eina_suite
+endif
+	@./src/tests/eo_suite/eo_suite
+if EFL_ENABLE_COVERAGE
 	@$(MAKE) lcov-report
+endif
 
 else
 
@@ -87,7 +92,7 @@ if EFL_ENABLE_BENCHMARK
 benchmark:
 	@cd src && $(MAKE) benchmark
 	@mkdir result || true
-	@cd result && ../src/tests/eina_bench `date +%F_%s`
+	@cd result && ../src/tests/eo_bench `date +%F_%s`
 
 else
 
diff --git a/configure.ac b/configure.ac
index 1c463cd..0bdd0c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -158,6 +158,15 @@ src/examples/eo_isa/Makefile
 src/examples/evas/Makefile
 src/examples/simple/Makefile
 src/lib/Makefile
+src/tests/Makefile
+src/tests/access/Makefile
+src/tests/composite_objects/Makefile
+src/tests/constructors/Makefile
+src/tests/eo_suite/Makefile
+src/tests/function_overrides/Makefile
+src/tests/interface/Makefile
+src/tests/mixin/Makefile
+src/tests/signals/Makefile
 ])
 
 AC_OUTPUT
@@ -176,7 +185,7 @@ echo
 echo "Configuration Options Summary:"
 echo
 echo "  Documentation........: ${build_doc}"
-echo "  Tests................: ${enable_tests} (Coverage: ${efl_enable_coverage})"
+echo "  Unit Tests...........: ${enable_tests} (Coverage: ${efl_enable_coverage})"
 echo "  Examples.............: ${enable_build_examples}"
 echo "  Benchmark............: ${enable_benchmark}"
 echo
diff --git a/m4/efl_tests.m4 b/m4/efl_tests.m4
index d8554e1..4f87559 100644
--- a/m4/efl_tests.m4
+++ b/m4/efl_tests.m4
@@ -37,7 +37,7 @@ if test "x${_efl_enable_tests}" = "xyes" ; then
       [_efl_enable_tests="no"])
 fi
 
-efl_enable_coverage="no"
+_efl_enable_coverage="no"
 if test "x${_efl_enable_tests}" = "xyes" ; then
    AC_CHECK_PROG(have_lcov, [lcov], [yes], [no])
    if test "x$have_lcov" = "xyes" ; then
@@ -49,13 +49,14 @@ if test "x${_efl_enable_tests}" = "xyes" ; then
       else
          m4_defn([UPEFL])[]_CFLAGS="${m4_defn([UPEFL])[]_CFLAGS} -g -O0 -DDEBUG"
       fi
-      efl_enable_coverage="yes"
+      _efl_enable_coverage="yes"
    else
       AC_MSG_WARN([lcov is not found, disable profiling instrumentation])
    fi
 fi
 
 AM_CONDITIONAL(EFL_ENABLE_TESTS, test "x${_efl_enable_tests}" = "xyes")
+AM_CONDITIONAL(EFL_ENABLE_COVERAGE, test "x${_efl_enable_coverage}" = "xyes")
 
 AS_IF([test "x$_efl_enable_tests" = "xyes"], [$2], [$3])
 
diff --git a/src/Makefile.am b/src/Makefile.am
index cb86447..849ab41 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = lib benchmarks examples
+SUBDIRS = lib benchmarks examples tests
 
 .PHONY: benchmark
 
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
new file mode 100644
index 0000000..0afd2fa
--- /dev/null
+++ b/src/tests/Makefile.am
@@ -0,0 +1,6 @@
+
+MAINTAINERCLEANFILES = Makefile.in
+
+SUBDIRS = access composite_objects constructors eo_suite function_overrides interface mixin signals
+
+EXTRA_DIST = eunit_tests.h
diff --git a/src/tests/access/Makefile.am b/src/tests/access/Makefile.am
new file mode 100644
index 0000000..a6d1475
--- /dev/null
+++ b/src/tests/access/Makefile.am
@@ -0,0 +1,20 @@
+
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CPPFLAGS = \
+-I$(top_srcdir)/src/lib \
+-I$(top_builddir)/src/lib \
+@EFL_EO_BUILD@ \
+@EO_CFLAGS@
+
+noinst_PROGRAMS = access
+
+access_SOURCES = \
+inherit.c \
+inherit.h \
+main.c \
+simple.c \
+simple.h \
+simple_protected.h
+
+access_LDADD = $(top_builddir)/src/lib/libeo.la @EO_LIBS@
diff --git a/src/tests/access/inherit.c b/src/tests/access/inherit.c
index 8f3fe4b..2c7d4f0 100644
--- a/src/tests/access/inherit.c
+++ b/src/tests/access/inherit.c
@@ -1,11 +1,13 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "Eo.h"
 #include "simple.h"
 #include "simple_protected.h"
 
 #include "inherit.h"
 
-#include "config.h"
-
 EAPI Eo_Op INHERIT_BASE_ID = 0;
 
 #define MY_CLASS INHERIT_CLASS
diff --git a/src/tests/access/inherit.h b/src/tests/access/inherit.h
index 26fa9d9..f701dae 100644
--- a/src/tests/access/inherit.h
+++ b/src/tests/access/inherit.h
@@ -1,8 +1,6 @@
 #ifndef INHERIT_H
 #define INHERIT_H
 
-#include "Eo.h"
-
 extern EAPI Eo_Op INHERIT_BASE_ID;
 
 enum {
diff --git a/src/tests/access/main.c b/src/tests/access/main.c
index 0cd352e..c211698 100644
--- a/src/tests/access/main.c
+++ b/src/tests/access/main.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "Eo.h"
 #include "simple.h"
 #include "inherit.h"
diff --git a/src/tests/access/simple.c b/src/tests/access/simple.c
index 64484be..ffa66cc 100644
--- a/src/tests/access/simple.c
+++ b/src/tests/access/simple.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "Eo.h"
 #include "simple.h"
 #include "simple_protected.h"
diff --git a/src/tests/access/simple.h b/src/tests/access/simple.h
index 902d89c..11624b7 100644
--- a/src/tests/access/simple.h
+++ b/src/tests/access/simple.h
@@ -1,8 +1,6 @@
 #ifndef SIMPLE_H
 #define SIMPLE_H
 
-#include "Eo.h"
-
 extern EAPI Eo_Op SIMPLE_BASE_ID;
 
 enum {
diff --git a/src/tests/access/simple_protected.h b/src/tests/access/simple_protected.h
index ff2fb7e..3cabcd8 100644
--- a/src/tests/access/simple_protected.h
+++ b/src/tests/access/simple_protected.h
@@ -1,8 +1,6 @@
 #ifndef SIMPLE_PROTECTED_H
 #define SIMPLE_PROTECTED_H
 
-#include "simple.h"
-
 typedef struct
 {
    Simple_Public_Data public;
diff --git a/src/tests/composite_objects/Makefile.am b/src/tests/composite_objects/Makefile.am
new file mode 100644
index 0000000..0b37eab
--- /dev/null
+++ b/src/tests/composite_objects/Makefile.am
@@ -0,0 +1,19 @@
+
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CPPFLAGS = \
+-I$(top_srcdir)/src/lib \
+-I$(top_builddir)/src/lib \
+@EFL_EO_BUILD@ \
+@EO_CFLAGS@
+
+noinst_PROGRAMS = composite_objects
+
+composite_objects_SOURCES = \
+comp.c \
+comp.h \
+main.c \
+simple.c \
+simple.h
+
+composite_objects_LDADD = $(top_builddir)/src/lib/libeo.la @EO_LIBS@
diff --git a/src/tests/composite_objects/comp.c b/src/tests/composite_objects/comp.c
index 2c27576..f0e5964 100644
--- a/src/tests/composite_objects/comp.c
+++ b/src/tests/composite_objects/comp.c
@@ -1,8 +1,10 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "Eo.h"
 #include "simple.h"
-
 #include "comp.h"
-#include "config.h"
 
 #include "../eunit_tests.h"
 
diff --git a/src/tests/composite_objects/comp.h b/src/tests/composite_objects/comp.h
index 87f61f7..95001b7 100644
--- a/src/tests/composite_objects/comp.h
+++ b/src/tests/composite_objects/comp.h
@@ -1,8 +1,6 @@
 #ifndef COMP_H
 #define COMP_H
 
-#include "Eo.h"
-
 #define COMP_CLASS comp_class_get()
 const Eo_Class *comp_class_get(void);
 
diff --git a/src/tests/composite_objects/main.c b/src/tests/composite_objects/main.c
index 453f6d2..ae5dc5d 100644
--- a/src/tests/composite_objects/main.c
+++ b/src/tests/composite_objects/main.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "Eo.h"
 #include "simple.h"
 #include "comp.h"
diff --git a/src/tests/composite_objects/simple.c b/src/tests/composite_objects/simple.c
index 2bd3259..070b837 100644
--- a/src/tests/composite_objects/simple.c
+++ b/src/tests/composite_objects/simple.c
@@ -1,8 +1,10 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "Eo.h"
 #include "simple.h"
 
-#include "config.h"
-
 EAPI Eo_Op SIMPLE_BASE_ID = 0;
 
 EAPI const Eo_Event_Description _EV_A_CHANGED =
diff --git a/src/tests/composite_objects/simple.h b/src/tests/composite_objects/simple.h
index 5d49b59..32a6246 100644
--- a/src/tests/composite_objects/simple.h
+++ b/src/tests/composite_objects/simple.h
@@ -1,8 +1,6 @@
 #ifndef SIMPLE_H
 #define SIMPLE_H
 
-#include "Eo.h"
-
 extern EAPI Eo_Op SIMPLE_BASE_ID;
 
 enum {
diff --git a/src/tests/constructors/Makefile.am b/src/tests/constructors/Makefile.am
new file mode 100644
index 0000000..0d37c60
--- /dev/null
+++ b/src/tests/constructors/Makefile.am
@@ -0,0 +1,31 @@
+
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CPPFLAGS = \
+-I$(top_srcdir)/src/lib \
+-I$(top_builddir)/src/lib \
+@EFL_EO_BUILD@ \
+@EO_CFLAGS@
+
+noinst_PROGRAMS = constructors
+
+constructors_SOURCES = \
+main.c \
+mixin.c \
+mixin.h \
+simple.c \
+simple.h \
+simple2.c \
+simple2.h \
+simple3.c \
+simple3.h \
+simple4.c \
+simple4.h \
+simple5.c \
+simple5.h \
+simple6.c \
+simple6.h \
+simple7.c \
+simple7.h
+
+constructors_LDADD = $(top_builddir)/src/lib/libeo.la @EO_LIBS@
diff --git a/src/tests/constructors/main.c b/src/tests/constructors/main.c
index 04d8888..21bf4b4 100644
--- a/src/tests/constructors/main.c
+++ b/src/tests/constructors/main.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "Eo.h"
 #include "simple.h"
 #include "simple2.h"
diff --git a/src/tests/constructors/mixin.c b/src/tests/constructors/mixin.c
index 8590329..9dc1c30 100644
--- a/src/tests/constructors/mixin.c
+++ b/src/tests/constructors/mixin.c
@@ -1,9 +1,11 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "Eo.h"
 #include "mixin.h"
 #include "simple.h"
 
-#include "config.h"
-
 EAPI Eo_Op MIXIN_BASE_ID = 0;
 
 #define MY_CLASS MIXIN_CLASS
diff --git a/src/tests/constructors/mixin.h b/src/tests/constructors/mixin.h
index 04f587e..9998b27 100644
--- a/src/tests/constructors/mixin.h
+++ b/src/tests/constructors/mixin.h
@@ -1,8 +1,6 @@
 #ifndef MIXIN_H
 #define MIXIN_H
 
-#include "Eo.h"
-
 extern EAPI Eo_Op MIXIN_BASE_ID;
 
 enum {
diff --git a/src/tests/constructors/simple.c b/src/tests/constructors/simple.c
index 5712534..f56828c 100644
--- a/src/tests/constructors/simple.c
+++ b/src/tests/constructors/simple.c
@@ -1,9 +1,11 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "Eo.h"
 #include "mixin.h"
 #include "simple.h"
 
-#include "config.h"
-
 EAPI Eo_Op SIMPLE_BASE_ID = 0;
 
 typedef struct
diff --git a/src/tests/constructors/simple.h b/src/tests/constructors/simple.h
index ac3e287..7342d34 100644
--- a/src/tests/constructors/simple.h
+++ b/src/tests/constructors/simple.h
@@ -1,8 +1,6 @@
 #ifndef SIMPLE_H
 #define SIMPLE_H
 
-#include "Eo.h"
-
 extern EAPI Eo_Op SIMPLE_BASE_ID;
 
 enum {
diff --git a/src/tests/constructors/simple2.c b/src/tests/constructors/simple2.c
index 65c9252..86c1aea 100644
--- a/src/tests/constructors/simple2.c
+++ b/src/tests/constructors/simple2.c
@@ -1,9 +1,11 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "Eo.h"
 #include "mixin.h"
 #include "simple2.h"
 
-#include "config.h"
-
 #define MY_CLASS SIMPLE2_CLASS
 
 static void
diff --git a/src/tests/constructors/simple2.h b/src/tests/constructors/simple2.h
index 0857c45..e6549f3 100644
--- a/src/tests/constructors/simple2.h
+++ b/src/tests/constructors/simple2.h
@@ -1,8 +1,6 @@
 #ifndef SIMPLE2_H
 #define SIMPLE2_H
 
-#include "Eo.h"
-
 #define SIMPLE2_CLASS simple2_class_get()
 const Eo_Class *simple2_class_get(void);
 
diff --git a/src/tests/constructors/simple3.c b/src/tests/constructors/simple3.c
index f199cc6..f671b4b 100644
--- a/src/tests/constructors/simple3.c
+++ b/src/tests/constructors/simple3.c
@@ -1,9 +1,11 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "Eo.h"
 #include "mixin.h"
 #include "simple3.h"
 
-#include "config.h"
-
 #define MY_CLASS SIMPLE3_CLASS
 
 static void
diff --git a/src/tests/constructors/simple3.h b/src/tests/constructors/simple3.h
index dbb3841..e27f8f1 100644
--- a/src/tests/constructors/simple3.h
+++ b/src/tests/constructors/simple3.h
@@ -1,8 +1,6 @@
 #ifndef SIMPLE3_H
 #define SIMPLE3_H
 
-#include "Eo.h"
-
 #define SIMPLE3_CLASS simple3_class_get()
 const Eo_Class *simple3_class_get(void);
 
diff --git a/src/tests/constructors/simple4.c b/src/tests/constructors/simple4.c
index d2a3dbf..95cfa73 100644
--- a/src/tests/constructors/simple4.c
+++ b/src/tests/constructors/simple4.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "Eo.h"
 #include "mixin.h"
 #include "simple.h"
diff --git a/src/tests/constructors/simple4.h b/src/tests/constructors/simple4.h
index 3e6d1a8..fe8e862 100644
--- a/src/tests/constructors/simple4.h
+++ b/src/tests/constructors/simple4.h
@@ -1,8 +1,6 @@
 #ifndef SIMPLE4_H
 #define SIMPLE4_H
 
-#include "Eo.h"
-
 #define SIMPLE4_CLASS simple4_class_get()
 const Eo_Class *simple4_class_get(void);
 
diff --git a/src/tests/constructors/simple5.c b/src/tests/constructors/simple5.c
index 5fc8378..9ff6d49 100644
--- a/src/tests/constructors/simple5.c
+++ b/src/tests/constructors/simple5.c
@@ -1,9 +1,11 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "Eo.h"
 #include "mixin.h"
 #include "simple5.h"
 
-#include "config.h"
-
 #define MY_CLASS SIMPLE5_CLASS
 
 static void
diff --git a/src/tests/constructors/simple5.h b/src/tests/constructors/simple5.h
index 8ae6215..9b262d4 100644
--- a/src/tests/constructors/simple5.h
+++ b/src/tests/constructors/simple5.h
@@ -1,8 +1,6 @@
 #ifndef SIMPLE5_H
 #define SIMPLE5_H
 
-#include "Eo.h"
-
 #define SIMPLE5_CLASS simple5_class_get()
 const Eo_Class *simple5_class_get(void);
 
diff --git a/src/tests/constructors/simple6.c b/src/tests/constructors/simple6.c
index 2749a8a..7c224d7 100644
--- a/src/tests/constructors/simple6.c
+++ b/src/tests/constructors/simple6.c
@@ -1,9 +1,11 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "Eo.h"
 #include "mixin.h"
 #include "simple6.h"
 
-#include "config.h"
-
 #define MY_CLASS SIMPLE6_CLASS
 
 static void
diff --git a/src/tests/constructors/simple6.h b/src/tests/constructors/simple6.h
index 32ee3cb..97e7b5e 100644
--- a/src/tests/constructors/simple6.h
+++ b/src/tests/constructors/simple6.h
@@ -1,8 +1,6 @@
 #ifndef SIMPLE6_H
 #define SIMPLE6_H
 
-#include "Eo.h"
-
 #define SIMPLE6_CLASS simple6_class_get()
 const Eo_Class *simple6_class_get(void);
 
diff --git a/src/tests/constructors/simple7.c b/src/tests/constructors/simple7.c
index ba86e2b..42af6cf 100644
--- a/src/tests/constructors/simple7.c
+++ b/src/tests/constructors/simple7.c
@@ -1,9 +1,12 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "Eo.h"
 #include "mixin.h"
 #include "simple7.h"
 #include "simple2.h"
 
-#include "config.h"
 #include "../eunit_tests.h"
 
 #define MY_CLASS SIMPLE7_CLASS
diff --git a/src/tests/constructors/simple7.h b/src/tests/constructors/simple7.h
index 3710b62..a9a201e 100644
--- a/src/tests/constructors/simple7.h
+++ b/src/tests/constructors/simple7.h
@@ -1,8 +1,6 @@
 #ifndef SIMPLE7_H
 #define SIMPLE7_H
 
-#include "Eo.h"
-
 #define SIMPLE7_CLASS simple7_class_get()
 const Eo_Class *simple7_class_get(void);
 
diff --git a/src/tests/eo_suite/class_simple.c b/src/tests/eo_suite/class_simple.c
index e0db709..bf60a9f 100644
--- a/src/tests/eo_suite/class_simple.c
+++ b/src/tests/eo_suite/class_simple.c
@@ -1,8 +1,10 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "Eo.h"
 #include "class_simple.h"
 
-#include "config.h"
-
 #define MY_CLASS SIMPLE_CLASS
 
 EAPI Eo_Op SIMPLE_BASE_ID = 0;
diff --git a/src/tests/eo_suite/class_simple.h b/src/tests/eo_suite/class_simple.h
index eb58f6d..9980b7b 100644
--- a/src/tests/eo_suite/class_simple.h
+++ b/src/tests/eo_suite/class_simple.h
@@ -1,8 +1,6 @@
 #ifndef SIMPLE_H
 #define SIMPLE_H
 
-#include "Eo.h"
-
 extern EAPI Eo_Op SIMPLE_BASE_ID;
 
 enum {
diff --git a/src/tests/eo_suite/eo_suite.c b/src/tests/eo_suite/eo_suite.c
index 69c3ad7..0494136 100644
--- a/src/tests/eo_suite/eo_suite.c
+++ b/src/tests/eo_suite/eo_suite.c
@@ -6,7 +6,6 @@
 #include <stdio.h>
 
 #include "Eo.h"
-
 #include "eo_suite.h"
 
 typedef struct _Eo_Test_Case Eo_Test_Case;
diff --git a/src/tests/eo_suite/eo_test_class_errors.c b/src/tests/eo_suite/eo_test_class_errors.c
index 269c87a..428359f 100644
--- a/src/tests/eo_suite/eo_test_class_errors.c
+++ b/src/tests/eo_suite/eo_test_class_errors.c
@@ -1,10 +1,11 @@
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 
 #include <stdio.h>
 
-#include "eo_suite.h"
 #include "Eo.h"
-
+#include "eo_suite.h"
 #include "class_simple.h"
 
 START_TEST(eo_incomplete_desc)
diff --git a/src/tests/eo_suite/eo_test_general.c b/src/tests/eo_suite/eo_test_general.c
index b1151eb..0de71dc 100644
--- a/src/tests/eo_suite/eo_test_general.c
+++ b/src/tests/eo_suite/eo_test_general.c
@@ -4,9 +4,8 @@
 
 #include <stdio.h>
 
-#include "eo_suite.h"
 #include "Eo.h"
-
+#include "eo_suite.h"
 #include "class_simple.h"
 
 START_TEST(eo_simple)
diff --git a/src/tests/eo_suite/eo_test_init.c b/src/tests/eo_suite/eo_test_init.c
index 851b857..3bf4b49 100644
--- a/src/tests/eo_suite/eo_test_init.c
+++ b/src/tests/eo_suite/eo_test_init.c
@@ -4,8 +4,8 @@
 
 #include <stdio.h>
 
-#include "eo_suite.h"
 #include "Eo.h"
+#include "eo_suite.h"
 
 START_TEST(eo_simple)
 {
diff --git a/src/tests/function_overrides/Makefile.am b/src/tests/function_overrides/Makefile.am
new file mode 100644
index 0000000..90c9582
--- /dev/null
+++ b/src/tests/function_overrides/Makefile.am
@@ -0,0 +1,23 @@
+
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CPPFLAGS = \
+-I$(top_srcdir)/src/lib \
+-I$(top_builddir)/src/lib \
+@EFL_EO_BUILD@ \
+@EO_CFLAGS@
+
+noinst_PROGRAMS = function_overrides
+
+function_overrides_SOURCES = \
+inherit.c \
+inherit.h \
+inherit2.c \
+inherit2.h \
+inherit3.c \
+inherit3.h \
+main.c \
+simple.c \
+simple.h
+
+function_overrides_LDADD = $(top_builddir)/src/lib/libeo.la @EO_LIBS@
diff --git a/src/tests/function_overrides/inherit.c b/src/tests/function_overrides/inherit.c
index a3cd3c9..2b3ad48 100644
--- a/src/tests/function_overrides/inherit.c
+++ b/src/tests/function_overrides/inherit.c
@@ -1,6 +1,9 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "Eo.h"
 #include "simple.h"
-
 #include "inherit.h"
 
 #define MY_CLASS INHERIT_CLASS
diff --git a/src/tests/function_overrides/inherit.h b/src/tests/function_overrides/inherit.h
index d72c73a..2f33647 100644
--- a/src/tests/function_overrides/inherit.h
+++ b/src/tests/function_overrides/inherit.h
@@ -1,8 +1,6 @@
 #ifndef INHERIT_H
 #define INHERIT_H
 
-#include "Eo.h"
-
 #define INHERIT_CLASS inherit_class_get()
 const Eo_Class *inherit_class_get(void);
 
diff --git a/src/tests/function_overrides/inherit2.c b/src/tests/function_overrides/inherit2.c
index 6814a34..484b6d0 100644
--- a/src/tests/function_overrides/inherit2.c
+++ b/src/tests/function_overrides/inherit2.c
@@ -1,11 +1,12 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "Eo.h"
 #include "simple.h"
-
 #include "inherit.h"
 #include "inherit2.h"
 
-#include "config.h"
-
 #include "../eunit_tests.h"
 
 EAPI Eo_Op INHERIT2_BASE_ID = 0;
diff --git a/src/tests/function_overrides/inherit2.h b/src/tests/function_overrides/inherit2.h
index 2bf7db9..2bc0b0d 100644
--- a/src/tests/function_overrides/inherit2.h
+++ b/src/tests/function_overrides/inherit2.h
@@ -1,8 +1,6 @@
 #ifndef INHERIT2_H
 #define INHERIT2_H
 
-#include "Eo.h"
-
 extern EAPI Eo_Op INHERIT2_BASE_ID;
 
 enum {
diff --git a/src/tests/function_overrides/inherit3.c b/src/tests/function_overrides/inherit3.c
index e36ab77..66f31fe 100644
--- a/src/tests/function_overrides/inherit3.c
+++ b/src/tests/function_overrides/inherit3.c
@@ -1,11 +1,12 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "Eo.h"
 #include "simple.h"
-
 #include "inherit2.h"
 #include "inherit3.h"
 
-#include "config.h"
-
 #define MY_CLASS INHERIT3_CLASS
 
 static void
diff --git a/src/tests/function_overrides/inherit3.h b/src/tests/function_overrides/inherit3.h
index 47d5d1c..73436ba 100644
--- a/src/tests/function_overrides/inherit3.h
+++ b/src/tests/function_overrides/inherit3.h
@@ -1,8 +1,6 @@
 #ifndef INHERIT3_H
 #define INHERIT3_H
 
-#include "Eo.h"
-
 #define INHERIT3_CLASS inherit3_class_get()
 const Eo_Class *inherit3_class_get(void);
 
diff --git a/src/tests/function_overrides/main.c b/src/tests/function_overrides/main.c
index af39c67..c45cfe5 100644
--- a/src/tests/function_overrides/main.c
+++ b/src/tests/function_overrides/main.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "Eo.h"
 #include "simple.h"
 #include "inherit.h"
diff --git a/src/tests/function_overrides/simple.c b/src/tests/function_overrides/simple.c
index bc3692c..3781890 100644
--- a/src/tests/function_overrides/simple.c
+++ b/src/tests/function_overrides/simple.c
@@ -1,7 +1,10 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "Eo.h"
 #include "simple.h"
 
-#include "config.h"
 #include "../eunit_tests.h"
 
 EAPI Eo_Op SIMPLE_BASE_ID = 0;
diff --git a/src/tests/function_overrides/simple.h b/src/tests/function_overrides/simple.h
index a447d8c..3a620fa 100644
--- a/src/tests/function_overrides/simple.h
+++ b/src/tests/function_overrides/simple.h
@@ -1,8 +1,6 @@
 #ifndef SIMPLE_H
 #define SIMPLE_H
 
-#include "Eo.h"
-
 extern EAPI Eo_Op SIMPLE_BASE_ID;
 
 enum {
diff --git a/src/tests/interface/Makefile.am b/src/tests/interface/Makefile.am
new file mode 100644
index 0000000..fa927fb
--- /dev/null
+++ b/src/tests/interface/Makefile.am
@@ -0,0 +1,21 @@
+
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CPPFLAGS = \
+-I$(top_srcdir)/src/lib \
+-I$(top_builddir)/src/lib \
+@EFL_EO_BUILD@ \
+@EO_CFLAGS@
+
+noinst_PROGRAMS = interface
+
+interface_SOURCES = \
+interface.c \
+interface.h \
+interface2.c \
+interface2.h \
+main.c \
+simple.c \
+simple.h
+
+interface_LDADD = $(top_builddir)/src/lib/libeo.la @EO_LIBS@
diff --git a/src/tests/interface/interface.c b/src/tests/interface/interface.c
index 16659d5..27a986b 100644
--- a/src/tests/interface/interface.c
+++ b/src/tests/interface/interface.c
@@ -1,9 +1,11 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "Eo.h"
 #include "interface.h"
 #include "simple.h"
 
-#include "config.h"
-
 EAPI Eo_Op INTERFACE_BASE_ID = 0;
 
 #define MY_CLASS INTERFACE_CLASS
diff --git a/src/tests/interface/interface.h b/src/tests/interface/interface.h
index 9a1c5fd..4e161b8 100644
--- a/src/tests/interface/interface.h
+++ b/src/tests/interface/interface.h
@@ -1,8 +1,6 @@
 #ifndef INTERFACE_H
 #define INTERFACE_H
 
-#include "Eo.h"
-
 extern EAPI Eo_Op INTERFACE_BASE_ID;
 
 enum {
diff --git a/src/tests/interface/interface2.c b/src/tests/interface/interface2.c
index 2ccd832..74619db 100644
--- a/src/tests/interface/interface2.c
+++ b/src/tests/interface/interface2.c
@@ -1,10 +1,12 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "Eo.h"
 #include "interface.h"
 #include "interface2.h"
 #include "simple.h"
 
-#include "config.h"
-
 EAPI Eo_Op INTERFACE2_BASE_ID = 0;
 
 #define MY_CLASS INTERFACE2_CLASS
diff --git a/src/tests/interface/interface2.h b/src/tests/interface/interface2.h
index 205b9b3..5aa91f4 100644
--- a/src/tests/interface/interface2.h
+++ b/src/tests/interface/interface2.h
@@ -1,8 +1,6 @@
 #ifndef INTERFACE2_H
 #define INTERFACE2_H
 
-#include "Eo.h"
-
 extern EAPI Eo_Op INTERFACE2_BASE_ID;
 
 enum {
diff --git a/src/tests/interface/main.c b/src/tests/interface/main.c
index e83ced9..0abe495 100644
--- a/src/tests/interface/main.c
+++ b/src/tests/interface/main.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "Eo.h"
 #include "simple.h"
 #include "interface.h"
diff --git a/src/tests/interface/simple.c b/src/tests/interface/simple.c
index c76315a..d19ecad 100644
--- a/src/tests/interface/simple.c
+++ b/src/tests/interface/simple.c
@@ -1,10 +1,12 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "Eo.h"
 #include "interface.h"
 #include "interface2.h"
 #include "simple.h"
 
-#include "config.h"
-
 EAPI Eo_Op SIMPLE_BASE_ID = 0;
 
 typedef struct
diff --git a/src/tests/interface/simple.h b/src/tests/interface/simple.h
index 61fa2f0..8df8131 100644
--- a/src/tests/interface/simple.h
+++ b/src/tests/interface/simple.h
@@ -1,8 +1,6 @@
 #ifndef SIMPLE_H
 #define SIMPLE_H
 
-#include "Eo.h"
-
 extern EAPI Eo_Op SIMPLE_BASE_ID;
 
 enum {
diff --git a/src/tests/mixin/Makefile.am b/src/tests/mixin/Makefile.am
new file mode 100644
index 0000000..fd03491
--- /dev/null
+++ b/src/tests/mixin/Makefile.am
@@ -0,0 +1,27 @@
+
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CPPFLAGS = \
+-I$(top_srcdir)/src/lib \
+-I$(top_builddir)/src/lib \
+@EFL_EO_BUILD@ \
+@EO_CFLAGS@
+
+noinst_PROGRAMS = mixin
+
+mixin_SOURCES = \
+inherit.c \
+inherit.h \
+main.c \
+mixin.c \
+mixin.h \
+mixin2.c \
+mixin2.h \
+mixin3.c \
+mixin3.h \
+mixin4.c \
+mixin4.h \
+simple.c \
+simple.h
+
+mixin_LDADD = $(top_builddir)/src/lib/libeo.la @EO_LIBS@
diff --git a/src/tests/mixin/inherit.c b/src/tests/mixin/inherit.c
index 53c8826..f23ec41 100644
--- a/src/tests/mixin/inherit.c
+++ b/src/tests/mixin/inherit.c
@@ -1,8 +1,12 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "Eo.h"
+#include "simple.h"
+#include "mixin4.h"
 #include "inherit.h"
 
-#include "config.h"
-
 #define MY_CLASS INHERIT_CLASS
 
 static void
diff --git a/src/tests/mixin/inherit.h b/src/tests/mixin/inherit.h
index b6d78fb..2f33647 100644
--- a/src/tests/mixin/inherit.h
+++ b/src/tests/mixin/inherit.h
@@ -1,10 +1,6 @@
 #ifndef INHERIT_H
 #define INHERIT_H
 
-#include "Eo.h"
-#include "simple.h"
-#include "mixin4.h"
-
 #define INHERIT_CLASS inherit_class_get()
 const Eo_Class *inherit_class_get(void);
 
diff --git a/src/tests/mixin/main.c b/src/tests/mixin/main.c
index c69754d..bd0c289 100644
--- a/src/tests/mixin/main.c
+++ b/src/tests/mixin/main.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "Eo.h"
 #include "simple.h"
 #include "inherit.h"
diff --git a/src/tests/mixin/mixin.c b/src/tests/mixin/mixin.c
index e9381e9..3be53ce 100644
--- a/src/tests/mixin/mixin.c
+++ b/src/tests/mixin/mixin.c
@@ -1,9 +1,11 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "Eo.h"
 #include "mixin.h"
 #include "simple.h"
 
-#include "config.h"
-
 EAPI Eo_Op MIXIN_BASE_ID = 0;
 
 #define MY_CLASS MIXIN_CLASS
diff --git a/src/tests/mixin/mixin.h b/src/tests/mixin/mixin.h
index 2fa0c22..745e5c4 100644
--- a/src/tests/mixin/mixin.h
+++ b/src/tests/mixin/mixin.h
@@ -1,8 +1,6 @@
 #ifndef MIXIN_H
 #define MIXIN_H
 
-#include "Eo.h"
-
 extern EAPI Eo_Op MIXIN_BASE_ID;
 
 enum {
diff --git a/src/tests/mixin/mixin2.c b/src/tests/mixin/mixin2.c
index c17dea6..a6eb82d 100644
--- a/src/tests/mixin/mixin2.c
+++ b/src/tests/mixin/mixin2.c
@@ -1,10 +1,12 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "Eo.h"
 #include "mixin.h"
 #include "mixin2.h"
 #include "simple.h"
 
-#include "config.h"
-
 #include "../eunit_tests.h"
 
 #define MY_CLASS MIXIN2_CLASS
diff --git a/src/tests/mixin/mixin2.h b/src/tests/mixin/mixin2.h
index 324afaf..6e4b692 100644
--- a/src/tests/mixin/mixin2.h
+++ b/src/tests/mixin/mixin2.h
@@ -1,8 +1,6 @@
 #ifndef MIXIN2_H
 #define MIXIN2_H
 
-#include "Eo.h"
-
 typedef struct
 {
    int count;
diff --git a/src/tests/mixin/mixin3.c b/src/tests/mixin/mixin3.c
index 94253b6..62468af 100644
--- a/src/tests/mixin/mixin3.c
+++ b/src/tests/mixin/mixin3.c
@@ -1,10 +1,12 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "Eo.h"
 #include "mixin.h"
 #include "mixin3.h"
 #include "simple.h"
 
-#include "config.h"
-
 #include "../eunit_tests.h"
 
 #define MY_CLASS MIXIN3_CLASS
diff --git a/src/tests/mixin/mixin3.h b/src/tests/mixin/mixin3.h
index a05c2ec..36b32c0 100644
--- a/src/tests/mixin/mixin3.h
+++ b/src/tests/mixin/mixin3.h
@@ -1,8 +1,6 @@
 #ifndef MIXIN3_H
 #define MIXIN3_H
 
-#include "Eo.h"
-
 typedef struct
 {
    int count;
diff --git a/src/tests/mixin/mixin4.c b/src/tests/mixin/mixin4.c
index 17944bc..1858841 100644
--- a/src/tests/mixin/mixin4.c
+++ b/src/tests/mixin/mixin4.c
@@ -1,10 +1,12 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "Eo.h"
 #include "mixin.h"
 #include "mixin4.h"
 #include "simple.h"
 
-#include "config.h"
-
 #include "../eunit_tests.h"
 
 #define MY_CLASS MIXIN4_CLASS
diff --git a/src/tests/mixin/mixin4.h b/src/tests/mixin/mixin4.h
index e924332..7b520fa 100644
--- a/src/tests/mixin/mixin4.h
+++ b/src/tests/mixin/mixin4.h
@@ -1,8 +1,6 @@
 #ifndef MIXIN4_H
 #define MIXIN4_H
 
-#include "Eo.h"
-
 #define MIXIN4_CLASS mixin4_class_get()
 const Eo_Class *mixin4_class_get(void);
 
diff --git a/src/tests/mixin/simple.c b/src/tests/mixin/simple.c
index ae93708..d7b95f2 100644
--- a/src/tests/mixin/simple.c
+++ b/src/tests/mixin/simple.c
@@ -1,11 +1,13 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "Eo.h"
 #include "mixin.h"
 #include "mixin2.h"
 #include "mixin3.h"
 #include "simple.h"
 
-#include "config.h"
-
 EAPI Eo_Op SIMPLE_BASE_ID = 0;
 
 typedef struct
diff --git a/src/tests/mixin/simple.h b/src/tests/mixin/simple.h
index 61fa2f0..8df8131 100644
--- a/src/tests/mixin/simple.h
+++ b/src/tests/mixin/simple.h
@@ -1,8 +1,6 @@
 #ifndef SIMPLE_H
 #define SIMPLE_H
 
-#include "Eo.h"
-
 extern EAPI Eo_Op SIMPLE_BASE_ID;
 
 enum {
diff --git a/src/tests/signals/Makefile.am b/src/tests/signals/Makefile.am
new file mode 100644
index 0000000..895e114
--- /dev/null
+++ b/src/tests/signals/Makefile.am
@@ -0,0 +1,17 @@
+
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CPPFLAGS = \
+-I$(top_srcdir)/src/lib \
+-I$(top_builddir)/src/lib \
+@EFL_EO_BUILD@ \
+@EO_CFLAGS@
+
+noinst_PROGRAMS = signals
+
+signals_SOURCES = \
+main.c \
+simple.c \
+simple.h
+
+signals_LDADD = $(top_builddir)/src/lib/libeo.la @EO_LIBS@
diff --git a/src/tests/signals/main.c b/src/tests/signals/main.c
index 26ac853..69e25b0 100644
--- a/src/tests/signals/main.c
+++ b/src/tests/signals/main.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "Eo.h"
 #include "simple.h"
 
diff --git a/src/tests/signals/simple.c b/src/tests/signals/simple.c
index 08210ea..168761c 100644
--- a/src/tests/signals/simple.c
+++ b/src/tests/signals/simple.c
@@ -1,8 +1,10 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "Eo.h"
 #include "simple.h"
 
-#include "config.h"
-
 EAPI Eo_Op SIMPLE_BASE_ID = 0;
 
 typedef struct
diff --git a/src/tests/signals/simple.h b/src/tests/signals/simple.h
index e54cf2a..d1f63bd 100644
--- a/src/tests/signals/simple.h
+++ b/src/tests/signals/simple.h
@@ -1,8 +1,6 @@
 #ifndef SIMPLE_H
 #define SIMPLE_H
 
-#include "Eo.h"
-
 extern EAPI Eo_Op SIMPLE_BASE_ID;
 
 enum {