414ae8f3d8ec9443c6f8eb351a2fc304df10de95
diff --git a/Makefile.am b/Makefile.am
index 9fa9710..1893a1f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,9 @@ pkgconfig_DATA = \
 	evince-backend-$(EV_API_VERSION).pc \
 	evince-view-$(EV_API_VERSION).pc
 
+headerdir = $(includedir)/evince/$(EV_API_VERSION)
+header_DATA = evince-backend.h evince-view.h
+
 # Applications 
 
 intltool_extra = intltool-extract.in intltool-merge.in intltool-update.in
diff --git a/evince-backend.h b/evince-backend.h
new file mode 100644
index 0000000..fb27e0e
--- /dev/null
+++ b/evince-backend.h
@@ -0,0 +1,56 @@
+/*
+* Copyright © 2009 Christian Persch
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02110-1301  USA
+ */
+
+#ifndef EV_BACKEND_H
+#define EV_BACKEND_H
+
+#define __EV_EV_BACKEND_H_INSIDE__
+
+#include<libdocument/ev-async-renderer.h>
+#include<libdocument/ev-attachment.h>
+#include<libdocument/ev-backends-manager.h>
+#include<libdocument/ev-document-find.h>
+#include<libdocument/ev-document-fonts.h>
+#include<libdocument/ev-document-forms.h>
+#include<libdocument/ev-document.h>
+#include<libdocument/ev-document-images.h>
+#include<libdocument/ev-document-info.h>
+#include<libdocument/ev-document-layers.h>
+#include<libdocument/ev-document-links.h>
+#include<libdocument/ev-document-misc.h>
+#include<libdocument/ev-document-security.h>
+#include<libdocument/ev-document-thumbnails.h>
+#include<libdocument/ev-document-transition.h>
+#include<libdocument/ev-document-type-builtins.h>
+#include<libdocument/ev-file-exporter.h>
+#include<libdocument/ev-file-helpers.h>
+#include<libdocument/ev-form-field.h>
+#include<libdocument/ev-image.h>
+#include<libdocument/ev-layer.h>
+#include<libdocument/ev-link-action.h>
+#include<libdocument/ev-link-dest.h>
+#include<libdocument/ev-link.h>
+#include<libdocument/ev-page.h>
+#include<libdocument/ev-render-context.h>
+#include<libdocument/ev-selection.h>
+#include<libdocument/ev-transition-effect.h>
+#include<libdocument/ev-version.h>
+
+#undef __EV_EV_BACKEND_H_INSIDE__
+
+#endif /* !EV_BACKEND_H */
diff --git a/evince-view.h b/evince-view.h
new file mode 100644
index 0000000..2a8bdff
--- /dev/null
+++ b/evince-view.h
@@ -0,0 +1,32 @@
+/*
+* Copyright © 2009 Christian Persch
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02110-1301  USA
+ */
+
+#ifndef EV_VIEW_H
+#define EV_VIEW_H
+
+#define __EV_EV_VIEW_H_INSIDE__
+
+#include <libview/ev-job-scheduler.h>
+#include <libview/ev-jobs.h>
+#include <libview/ev-page-cache.h>
+#include <libview/ev-view.h>
+#include <libview/ev-view-type-builtins.h>
+
+#undef __EV_EV_VIEW_H_INSIDE__
+
+#endif /* !EV_VIEW_H */
diff --git a/help/reference/Makefile.am b/help/reference/Makefile.am
index a8d23c2..2c92668 100644
--- a/help/reference/Makefile.am
+++ b/help/reference/Makefile.am
@@ -73,6 +73,8 @@ expand_content_files=
 # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 INCLUDES= \
+	-I$(top_srcdir)					\
+	-I$(top_builddir)				\
 	-I$(top_srcdir)/shell \
 	-DDATADIR=\"$(pkgdatadir)\"			\
 	-DGNOMEDATADIR=\"$(datadir)\"			\
diff --git a/libdocument/Makefile.am b/libdocument/Makefile.am
index a44ed64..7d4c286 100644
--- a/libdocument/Makefile.am
+++ b/libdocument/Makefile.am
@@ -52,7 +52,7 @@ INST_H_FILES = 					\
 	ev-transition-effect.h			\
 	ev-version.h
 
-headerdir = $(includedir)/evince/$(EV_API_VERSION)/ev-backend
+headerdir = $(includedir)/evince/$(EV_API_VERSION)/libdocument
 header_DATA = $(INST_H_FILES)
 
 libevbackend_la_SOURCES=			\
diff --git a/libview/Makefile.am b/libview/Makefile.am
index eede6da..3106620 100644
--- a/libview/Makefile.am
+++ b/libview/Makefile.am
@@ -1,7 +1,9 @@
 INCLUDES=					\
 	-DG_LOG_DOMAIN=\"EvView\"		\
 	-DGNOMELOCALEDIR=\"$(datadir)/locale\"	\
+	-I$(top_srcdir)				\
 	-I$(top_srcdir)/libdocument		\
+	-I$(top_builddir)			\
 	$(LIBVIEW_CFLAGS)			\
 	$(WARN_CFLAGS)				\
 	$(DISABLE_DEPRECATED)
@@ -30,7 +32,7 @@ INST_H_FILES = 				\
 	ev-view.h			\
 	ev-view-type-builtins.h
 
-headerdir = $(includedir)/evince/$(EV_API_VERSION)/ev-view
+headerdir = $(includedir)/evince/$(EV_API_VERSION)/libview
 header_DATA = $(INST_H_FILES)
 
 libevview_la_SOURCES = 			\
diff --git a/libview/ev-jobs.h b/libview/ev-jobs.h
index 5915a28..961049d 100644
--- a/libview/ev-jobs.h
+++ b/libview/ev-jobs.h
@@ -24,9 +24,7 @@
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 
-#include "ev-document.h"
-#include "ev-selection.h"
-#include "ev-render-context.h"
+#include <evince-backend.h>
 
 G_BEGIN_DECLS
 
diff --git a/libview/ev-page-cache.h b/libview/ev-page-cache.h
index 43f4553..c032414 100644
--- a/libview/ev-page-cache.h
+++ b/libview/ev-page-cache.h
@@ -22,7 +22,7 @@
 
 #include <gtk/gtk.h>
 
-#include "ev-document.h"
+#include <evince-backend.h>
 
 G_BEGIN_DECLS
 #define EV_TYPE_PAGE_CACHE            (ev_page_cache_get_type ())
diff --git a/libview/ev-pixbuf-cache.h b/libview/ev-pixbuf-cache.h
index 5e48f28..89c0b4b 100644
--- a/libview/ev-pixbuf-cache.h
+++ b/libview/ev-pixbuf-cache.h
@@ -26,8 +26,7 @@
 
 #include <gtk/gtk.h>
 
-#include "ev-document.h"
-#include "ev-selection.h"
+#include <evince-backend.h>
 
 G_BEGIN_DECLS
 
diff --git a/libview/ev-view.h b/libview/ev-view.h
index af12baf..35fed44 100644
--- a/libview/ev-view.h
+++ b/libview/ev-view.h
@@ -22,8 +22,7 @@
 
 #include <gtk/gtk.h>
 
-#include "ev-document.h"
-#include "ev-link.h"
+#include <evince-backend.h>
 
 G_BEGIN_DECLS
 
diff --git a/shell/Makefile.am b/shell/Makefile.am
index ab09ef9..52cf4b0 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,6 +1,8 @@
 INCLUDES=							\
 	-DDATADIR=\"$(pkgdatadir)\"				\
 	-DGNOMEDATADIR=\"$(datadir)\"				\
+	-I$(top_srcdir)						\
+	-I$(top_builddir)					\
 	-I$(top_srcdir)/cut-n-paste/zoom-control/		\
 	-I$(top_srcdir)/cut-n-paste/toolbar-editor/		\
 	-I$(top_srcdir)/cut-n-paste/totem-screensaver/		\
