diff -Nru embryo-201210260821/configure.ac embryo-201210270411/configure.ac
--- embryo-201210260821/configure.ac	2012-10-26 08:21:51.000000000 +0000
+++ embryo-201210270411/configure.ac	2012-10-27 04:11:42.000000000 +0000
@@ -63,7 +63,6 @@
 AC_CANONICAL_HOST
 
 requirement_embryo=""
-embryoincludedir="${datadir}/include"
 
 
 ### Additional options to configure
@@ -133,31 +132,16 @@
 
 ### Checks for compiler characteristics
 AC_C_BIGENDIAN
-AM_PROG_CC_C_O
-AC_C_CONST
 AC_C_INLINE
 AC_PROG_CC_STDC
-AC_HEADER_STDC
 AC_C___ATTRIBUTE__
 
-EMBRYO_CPPFLAGS=""
-EMBRYO_CFLAGS=""
-case "$host_os" in
-   mingw32ce*)
-      EMBRYO_CPPFLAGS="-D_WIN32_WCE=0x0420"
-      ;;
-esac
-AC_SUBST(EMBRYO_CPPFLAGS)
-AC_SUBST(EMBRYO_CFLAGS)
-
 
 ### Checks for linker characteristics
 
 
 ### Checks for library functions
 
-AC_ISC_POSIX
-
 # alloca
 AC_FUNC_ALLOCA
 
@@ -168,8 +152,7 @@
 EFL_CHECK_GETTIMEOFDAY([], [AC_MSG_ERROR([Cannot find gettimeofday()])])
 
 
-AC_SUBST(requirement_embryo)
-AC_SUBST(embryoincludedir)
+AC_SUBST([requirement_embryo])
 
 AC_OUTPUT([
 Makefile
diff -Nru embryo-201210260821/debian/bzr-builder.manifest embryo-201210270411/debian/bzr-builder.manifest
--- embryo-201210260821/debian/bzr-builder.manifest	2012-10-26 08:21:51.000000000 +0000
+++ embryo-201210270411/debian/bzr-builder.manifest	2012-10-27 04:11:42.000000000 +0000
@@ -1,3 +1,3 @@
-# bzr-builder format 0.2 deb-version 201210260821-5
-lp:~cschieli/freebox-embryo/upstream-trunk revid:svn-v4:7cbeb6ba-43b4-40fd-8cce-4c39aea84d33:trunk/embryo:78496
+# bzr-builder format 0.2 deb-version 201210270411-5
+lp:~cschieli/freebox-embryo/upstream-trunk revid:svn-v4:7cbeb6ba-43b4-40fd-8cce-4c39aea84d33:trunk/embryo:78502
 nest packaging lp:~cschieli/freebox-embryo/daily-packaging debian revid:cschieli@gmail.com-20110518184828-fkkz157di1se5kaf
diff -Nru embryo-201210260821/debian/changelog embryo-201210270411/debian/changelog
--- embryo-201210260821/debian/changelog	2012-10-26 08:21:51.000000000 +0000
+++ embryo-201210270411/debian/changelog	2012-10-27 04:11:42.000000000 +0000
@@ -1,8 +1,8 @@
-embryo (201210260821-5~natty1) natty; urgency=low
+embryo (201210270411-5~natty1) natty; urgency=low
 
   * Auto build.
 
- -- Cedric Schieli <cschieli@gmail.com>  Fri, 26 Oct 2012 08:21:51 +0000
+ -- Cedric Schieli <cschieli@gmail.com>  Sat, 27 Oct 2012 04:11:42 +0000
 
 embryo (0) lucid; urgency=low
 
diff -Nru embryo-201210260821/embryo.pc.in embryo-201210270411/embryo.pc.in
--- embryo-201210260821/embryo.pc.in	2012-10-26 08:21:51.000000000 +0000
+++ embryo-201210270411/embryo.pc.in	2012-10-27 04:11:42.000000000 +0000
@@ -4,7 +4,7 @@
 includedir=@includedir@
 datarootdir=@datarootdir@
 datadir=@datadir@/@PACKAGE@
-embryoincludedir=@embryoincludedir@
+embryoincludedir=@datadir@/include
 
 Name: embryo
 Description: A small virtual machine engine and bytecode compiler
diff -Nru embryo-201210260821/src/bin/Makefile.am embryo-201210270411/src/bin/Makefile.am
--- embryo-201210260821/src/bin/Makefile.am	2012-10-26 08:21:51.000000000 +0000
+++ embryo-201210270411/src/bin/Makefile.am	2012-10-27 04:11:42.000000000 +0000
@@ -31,7 +31,6 @@
 embryo_cc_prefix.c \
 embryo_cc_prefix.h
 
-embryo_cc_CFLAGS = @EMBRYO_CFLAGS@
 embryo_cc_LDADD = $(top_builddir)/src/lib/libembryo.la @EVIL_LIBS@ @EINA_LIBS@ -lm
 
 EXTRA_DIST = \
diff -Nru embryo-201210260821/src/lib/Makefile.am embryo-201210270411/src/lib/Makefile.am
--- embryo-201210260821/src/lib/Makefile.am	2012-10-26 08:21:51.000000000 +0000
+++ embryo-201210270411/src/lib/Makefile.am	2012-10-27 04:11:42.000000000 +0000
@@ -12,8 +12,7 @@
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
 -DEFL_EMBRYO_BUILD \
 @EVIL_CFLAGS@ \
-@EXOTIC_CFLAGS@ \
-@EMBRYO_CPPFLAGS@
+@EXOTIC_CFLAGS@
 
 includes_HEADERS = Embryo.h
 includesdir = $(includedir)/embryo-@VMAJ@
@@ -27,10 +26,8 @@
 embryo_main.c \
 embryo_rand.c \
 embryo_str.c \
-embryo_time.c
+embryo_time.c \
+embryo_private.h
 
-libembryo_la_CFLAGS = @EMBRYO_CFLAGS@
 libembryo_la_LIBADD = @EXOTIC_LIBS@ @EVIL_LIBS@ -lm
 libembryo_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
-
-EXTRA_DIST = embryo_private.h