diff --git a/configure.in b/configure.in
index 9002a80a2..baa5b7f98 100644
--- a/configure.in
+++ b/configure.in
@@ -7,7 +7,7 @@ AC_INIT(configure.in)
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_ISC_POSIX
-AM_INIT_AUTOMAKE(enlightenment, 0.16.999.007)
+AM_INIT_AUTOMAKE(enlightenment, 0.16.999.008)
 AM_CONFIG_HEADER(config.h)
 
 AC_C_BIGENDIAN
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index a19df5902..f7d611f89 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -10,9 +10,7 @@ include_HEADERS		= E.h
 
 libe_la_SOURCES= \
 e_main.c \
-e.h \
-../bin/e_ipc_codec.c \
-../bin/e_ipc_codec.h \
+E.h \
 e_private.h
 
 libe_la_LIBADD		= @ecore_libs@ @evas_libs@
diff --git a/src/lib/e_main.c b/src/lib/e_main.c
index a51a7718a..c7fee4660 100644
--- a/src/lib/e_main.c
+++ b/src/lib/e_main.c
@@ -17,10 +17,20 @@
  */
 
 #include <Evas.h>
-#include "E.h"
-#include "e_private.h"
+#include <Eet.h>
 #include <Ecore.h>
 #include <Ecore_Ipc.h>
+#include "E.h"
+#include "e_private.h"
+
+#define E_TYPEDEFS 1
+#include "e_config.h"
+#include "e_ipc_codec.h"
+#undef E_TYPEDEFS
+#include "e_config.h"
+#include "e_ipc_codec.h"
+#define E_H
+#include "e_ipc_codec.c"
 
 typedef struct _Opt Opt;
 
diff --git a/src/lib/e_private.h b/src/lib/e_private.h
index e88ee5f6b..4cee0c21c 100644
--- a/src/lib/e_private.h
+++ b/src/lib/e_private.h
@@ -25,8 +25,4 @@
 
 #endif
 
-#define E_TYPEDEFS 1
-#include "e_ipc_codec.h"
-#undef E_TYPEDEFS
-#include "e_ipc_codec.h"