diff --git a/Makefile.am b/Makefile.am
index 1760142..2a744ac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,6 +4,6 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
 
 EXTRA_DIST = README AUTHORS COPYING autogen.sh
 
-SUBDIRS = include src data
+SUBDIRS = src data
 
 ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index 91edcb4..b2aaf8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,8 +84,8 @@ EFL_WITH_BIN([edje], [edje-cc], [edje_cc])
 
 AC_CONFIG_FILES([
 Makefile
-include/Makefile
 src/Makefile
+src/include/Makefile
 src/bin/Makefile
 data/Makefile
 data/images/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 1c5d6ee..644f7ba 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,3 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = bin
+SUBDIRS = bin include
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 1dac4cf..ece23c4 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -6,7 +6,7 @@ AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
 	-DPACKAGE_BIN_DIR=\"$(bindir)\" \
 	-DPACKAGE_LIB_DIR=\"$(libdir)\" \
 	-I$(top_srcdir)/src/bin \
-	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/src/include \
         @ENVENTOR_CFLAGS@
 
 enventor_SOURCES = \
diff --git a/include/Makefile.am b/src/include/Makefile.am
similarity index 100%
rename from include/Makefile.am
rename to src/include/Makefile.am
diff --git a/include/common.h b/src/include/common.h
similarity index 100%
rename from include/common.h
rename to src/include/common.h
diff --git a/include/config_data.h b/src/include/config_data.h
similarity index 100%
rename from include/config_data.h
rename to src/include/config_data.h
diff --git a/include/ctxpopup.h b/src/include/ctxpopup.h
similarity index 100%
rename from include/ctxpopup.h
rename to src/include/ctxpopup.h
diff --git a/include/dummy_obj.h b/src/include/dummy_obj.h
similarity index 100%
rename from include/dummy_obj.h
rename to src/include/dummy_obj.h
diff --git a/include/edc_editor.h b/src/include/edc_editor.h
similarity index 100%
rename from include/edc_editor.h
rename to src/include/edc_editor.h
diff --git a/include/edc_parser.h b/src/include/edc_parser.h
similarity index 100%
rename from include/edc_parser.h
rename to src/include/edc_parser.h
diff --git a/include/edj_viewer.h b/src/include/edj_viewer.h
similarity index 100%
rename from include/edj_viewer.h
rename to src/include/edj_viewer.h
diff --git a/include/menu.h b/src/include/menu.h
similarity index 100%
rename from include/menu.h
rename to src/include/menu.h
diff --git a/include/panes.h b/src/include/panes.h
similarity index 100%
rename from include/panes.h
rename to src/include/panes.h
diff --git a/include/statusbar.h b/src/include/statusbar.h
similarity index 100%
rename from include/statusbar.h
rename to src/include/statusbar.h
diff --git a/include/syntax_color.h b/src/include/syntax_color.h
similarity index 100%
rename from include/syntax_color.h
rename to src/include/syntax_color.h