diff --git a/src/lib/E.h b/src/lib/E_Lib.h
similarity index 100%
rename from src/lib/E.h
rename to src/lib/E_Lib.h
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index f7d611f89..6d6093a62 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES		= -I$(includedir) \
 
 lib_LTLIBRARIES		= libe.la
 
-include_HEADERS		= E.h
+include_HEADERS		= E_Lib.h
 
 libe_la_SOURCES= \
 e_main.c \
diff --git a/src/lib/e_main.c b/src/lib/e_main.c
index 9178bec67..4b201995f 100644
--- a/src/lib/e_main.c
+++ b/src/lib/e_main.c
@@ -20,9 +20,11 @@
 #include <Eet.h>
 #include <Ecore.h>
 #include <Ecore_Ipc.h>
-#include "E.h"
+#include "E_Lib.h"
 #include "e.h"
 
+#include "e_ipc_codec.c"
+
 typedef struct _Opt Opt;
 
 struct _Opt