diff --git a/eflxx_examples/configure.ac b/eflxx_examples/configure.ac
index dc97d27..84f1a02 100644
--- a/eflxx_examples/configure.ac
+++ b/eflxx_examples/configure.ac
@@ -3,7 +3,7 @@ dnl Created by Anjuta application wizard.
 
 AC_INIT(eflxx_examples, 0.1)
 
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+AM_INIT_AUTOMAKE
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AM_MAINTAINER_MODE
diff --git a/eflxx_examples/src/Makefile.am b/eflxx_examples/src/Makefile.am
index 6cc830f..1fe7d7e 100644
--- a/eflxx_examples/src/Makefile.am
+++ b/eflxx_examples/src/Makefile.am
@@ -18,6 +18,7 @@ SUBDIRS = \
 	eetxx \
 	debug \
 	signals \
+	emotionxx \
 	elementaryxx \
 	einaxx
 
diff --git a/emotionxx/include/emotionxx/Object.h b/emotionxx/include/emotionxx/Object.h
index b528e64..a65f079 100644
--- a/emotionxx/include/emotionxx/Object.h
+++ b/emotionxx/include/emotionxx/Object.h
@@ -2,7 +2,10 @@
 #define EMOTIONXX_OBJECT_H
 
 /* EFL */
+extern "C"
+{
 #include <Emotion.h>
+}
 
 /* EFL++ */
 #include <eflxx/Common.h>