diff --git a/Makefile.am b/Makefile.am
index 5c315748..2da7418b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src tests doc
+SUBDIRS = include src tests doc
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 headers = config.h
 
diff --git a/abigail.m4 b/abigail.m4
index 9dda668c..4ce4e44f 100644
--- a/abigail.m4
+++ b/abigail.m4
@@ -101,7 +101,7 @@ AC_DEFUN([ABIGAIL_INIT],
    if test -d $srcdir/libabigail -a -f $srcdir/gcc/gcc.c; then
       libpath='$$r/$(HOST_SUBDIR)/libabigail/src/'"${lt_cv_objdir}"
       abigaillibs="-L$libpath ${abigaillibs}"
-      abigailinc='-I${srcdir}/libabigail/src '"${abigailinc}"
+      abigailinc='-I${srcdir}/libabigail/include '"${abigailinc}"
       found_abigail_lib=yes
       found_abigail_inc=yes
       HAVE_LIBABIGAIL=yes
diff --git a/configure.ac b/configure.ac
index 8bd008aa..137eba6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,9 +54,11 @@ if test x$ABIGAIL_DEVEL != x; then
 fi
 
 AC_CONFIG_FILES([Makefile
+include/Makefile
+include/libabigail/Makefile
 doc/Makefile
 src/Makefile
 tests/Makefile])
-AC_CONFIG_FILES([src/abg-version.h])
+AC_CONFIG_FILES([include/libabigail/abg-version.h])
 
 AC_OUTPUT
diff --git a/doc/api/libabigail.doxy b/doc/api/libabigail.doxy
index 2efce3cd..4d74e25b 100644
--- a/doc/api/libabigail.doxy
+++ b/doc/api/libabigail.doxy
@@ -683,7 +683,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  =  LIBABIGAIL_INPUT/src
+INPUT                  =  LIBABIGAIL_INPUT/src LIBABIGAIL_INPUT/include/libabigail
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
diff --git a/include/Makefile.am b/include/Makefile.am
new file mode 100644
index 00000000..07eee0dc
--- /dev/null
+++ b/include/Makefile.am
@@ -0,0 +1,2 @@
+SUBDIRS = libabigail
+
diff --git a/include/libabigail/Makefile.am b/include/libabigail/Makefile.am
new file mode 100644
index 00000000..9a361978
--- /dev/null
+++ b/include/libabigail/Makefile.am
@@ -0,0 +1,16 @@
+headers =		\
+abg-ir.h		\
+abg-reader.h		\
+abg-corpus.h		\
+abg-libxml-utils.h	\
+abg-hash.h		\
+abg-writer.h		\
+abg-config.h		\
+abg-version.h		\
+abg-viz-common.h	\
+abg-viz-dot.h		\
+abg-viz-svg.h		
+
+publicheaders_DATA=$(headers)
+publicheadersdir=$(includedir)/libabigail
+
diff --git a/src/abg-config.h b/include/libabigail/abg-config.h
similarity index 100%
rename from src/abg-config.h
rename to include/libabigail/abg-config.h
diff --git a/src/abg-corpus.h b/include/libabigail/abg-corpus.h
similarity index 100%
rename from src/abg-corpus.h
rename to include/libabigail/abg-corpus.h
diff --git a/src/abg-hash.h b/include/libabigail/abg-hash.h
similarity index 100%
rename from src/abg-hash.h
rename to include/libabigail/abg-hash.h
diff --git a/src/abg-ir.h b/include/libabigail/abg-ir.h
similarity index 100%
rename from src/abg-ir.h
rename to include/libabigail/abg-ir.h
diff --git a/src/abg-libxml-utils.h b/include/libabigail/abg-libxml-utils.h
similarity index 100%
rename from src/abg-libxml-utils.h
rename to include/libabigail/abg-libxml-utils.h
diff --git a/src/abg-reader.h b/include/libabigail/abg-reader.h
similarity index 100%
rename from src/abg-reader.h
rename to include/libabigail/abg-reader.h
diff --git a/src/abg-version.h.in b/include/libabigail/abg-version.h.in
similarity index 100%
rename from src/abg-version.h.in
rename to include/libabigail/abg-version.h.in
diff --git a/src/abg-viz-common.h b/include/libabigail/abg-viz-common.h
similarity index 100%
rename from src/abg-viz-common.h
rename to include/libabigail/abg-viz-common.h
diff --git a/src/abg-viz-dot.h b/include/libabigail/abg-viz-dot.h
similarity index 100%
rename from src/abg-viz-dot.h
rename to include/libabigail/abg-viz-dot.h
diff --git a/src/abg-viz-svg.h b/include/libabigail/abg-viz-svg.h
similarity index 100%
rename from src/abg-viz-svg.h
rename to include/libabigail/abg-viz-svg.h
diff --git a/src/abg-writer.h b/include/libabigail/abg-writer.h
similarity index 100%
rename from src/abg-writer.h
rename to include/libabigail/abg-writer.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 737090f7..6d38b99b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,19 +1,6 @@
 libabigail_LTLIBRARIES=libabigail.la
 libabigaildir=$(libdir)/
 
-headers =		\
-abg-ir.h		\
-abg-reader.h		\
-abg-corpus.h		\
-abg-libxml-utils.h	\
-abg-hash.h		\
-abg-writer.h		\
-abg-config.h		\
-abg-version.h		\
-abg-viz-common.h	\
-abg-viz-dot.h		\
-abg-viz-svg.h		
-
 libabigail_la_SOURCES = $(headers)	\
 abg-ir.cc				\
 abg-reader.cc			\
@@ -28,8 +15,5 @@ abg-viz-svg.cc
 
 libabigail_la_LDFLAGS=@XML_LIBS@ -Wl,--as-needed
 
-publicheaders_DATA=$(headers)
-publicheadersdir=$(includedir)/libabigail
-
-AM_CPPFLAGS=@XML_CFLAGS@ -Wall
+AM_CPPFLAGS=@XML_CFLAGS@ -Wall -I$(top_srcdir)/include/libabigail -I$(top_builddir)/include/libabigail
 AM_CXXFLAGS="-std=gnu++11"
diff --git a/tests/Makefile.am b/tests/Makefile.am
index fe9bda48..04550a63 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -24,7 +24,7 @@ runtestsvg_LDADD=$(top_builddir)/src/libabigail.la
 runtestdot_SOURCES=test-dot.cc
 runtestdot_LDADD=$(top_builddir)/src/libabigail.la
 
-AM_CPPFLAGS=-I${top_srcdir}/src
+AM_CPPFLAGS=-I${top_srcdir}/include/libabigail -I${top_builddir}/include/libabigail
 AM_CXXFLAGS="-std=gnu++11"
 
 EXTRA_DIST=				\