diff --git a/doc/Makefile.am b/doc/Makefile.am
index b79498f..cd9f380 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-dist_man1_MANS = xscanimage.1 xcam.1 scanadf.1
+dist_man1_MANS = xscanimage.man xcam.man scanadf.man
 
 dist_data_DATA = sane.png xscanimage-icon-48x48-2.png
 
diff --git a/include/Makefile.am b/include/Makefile.am
index 63b7004..839732d 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,6 +1,4 @@
-SANE_INCLUDES = $(addprefix $(top_srcdir)/include/sane/,config.h.in sanei.h \
-  sanei_codec_ascii.h sanei_codec_bin.h sanei_debug.h sanei_wire.h)
-OTHER_INCLUDES = $(addprefix $(top_srcdir)/include/,Makefile.in getopt.h \
-  lalloca.h)
+SANE_INCLUDES = sane/config.h.in sane/sanei.h sane/sanei_codec_ascii.h sane/sanei_codec_bin.h sane/sanei_debug.h sane/sanei_wire.h
+OTHER_INCLUDES = Makefile.in getopt.h lalloca.h
 
 noinst_HEADERS = $(SANE_INCLUDES) $(OTHER_INCLUDES)
diff --git a/libgtk/Makefile.am b/libgtk/Makefile.am
index b91c956..a1e088f 100644
--- a/libgtk/Makefile.am
+++ b/libgtk/Makefile.am
@@ -1,5 +1,7 @@
 noinst_LIBRARIES = libgtksane.a
 
+noinst_HEADERS = gtk3curve.h gtk3gamma.h gtk3ruler.h utils-gtk.h
+
 libgtksane_a_SOURCES = gtk3curve.c \
                         gtk3gamma.c \
                         gtk3ruler.c \
diff --git a/src/Makefile.am b/src/Makefile.am
index 518040e..097fa44 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,8 @@
 EXTRA_PROGRAMS = xscanimage xcam
 bin_PROGRAMS = scanadf $(GUI_PROGS) 
 
+noinst_HEADERS = font_6x11.h gtkglue.h preferences.h preview.h progress.h xscanimage-gimp-1_0-compat.h
+
 xscanimage_SOURCES = xscanimage.c progress.c preview.c preferences.c gtkglue.c
 xscanimage_CPPFLAGS = $(SANE_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)/include
 xscanimage_LDADD =  $(top_builddir)/libgtk/libgtksane.a $(GIMP_LIBS) $(SANE_LIBS) $(GTK_LIBS) $(top_builddir)/sanei/libsanei.a