diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index dc77060..711d685 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -5,6 +5,7 @@ bin_PROGRAMS = enventor
 AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
 	-DPACKAGE_BIN_DIR=\"$(bindir)\" \
 	-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+	-I$(top_srcdir)/src/lib \
 	-I$(top_srcdir)/src/bin \
 	-I$(top_srcdir)/src/include \
 	@ENVENTOR_CFLAGS@
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 6e9cdf2..c38884c 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -3,8 +3,6 @@ MAINTAINERCLEANFILES = Makefile.in
 EXTRA_DIST = common.h \
 	base_gui.h \
 	config_data.h \
-	dummy_obj.h \
-	edj_viewer.h \
 	menu.h \
 	panes.h \
 	statusbar.h \
diff --git a/src/lib/Enventor.h b/src/lib/Enventor.h
index 3798ae8..8838c1e 100644
--- a/src/lib/Enventor.h
+++ b/src/lib/Enventor.h
@@ -14,11 +14,11 @@ extern "C"
 #include <Elementary.h>
 
 #ifndef EFL_NOLEGACY_API_SUPPORT
-#include "Enventor_Legacy.h"
+#include <Enventor_Legacy.h>
 #endif
 
 #ifdef EFL_EO_API_SUPPORT
-#include "Enventor_Eo.h"
+#include <Enventor_Eo.h>
 #endif
 
 EAPI int enventor_init(int argc, char **argv);
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 36498a4..6d2677d 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -19,12 +19,15 @@ AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
 lib_LTLIBRARIES = libenventor.la
 
 includes_HEADERS = \
-   Enventor.h \
    Enventor_Legacy.h \
+   Enventor.h \
    Enventor_Eo.h
 includesdir = $(includedir)/enventor-@ENVENTOR_VERSION_MAJOR@
 
 libenventor_la_SOURCES = \
+   enventor_private.h \
+   auto_comp_code.h \
+   template_code.h \
    enventor_main.c \
    enventor_smart.c \
    edc_parser.c \
@@ -36,10 +39,10 @@ libenventor_la_SOURCES = \
    edc_editor.c \
    auto_comp.c \
    build.c \
-	template.c \
-	edj_mgr.c \
-	edj_viewer.c \
-	dummy_obj.c
+   template.c \
+   edj_mgr.c \
+   edj_viewer.c \
+   dummy_obj.c
 
 libenventor_la_CFLAGS = @ENVENTOR_CFLAGS@
 libenventor_la_LIBADD = @ENVENTOR_LIBS@