Fixed INCLUDES

@@ -4,7 +4,7 @@
 
 AUTOMAKE_OPTIONS = ../lib/ansi2knr 
 AM_YFLAGS=-vt
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib 
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_srcdir}/mailbox
 AM_CFLAGS = -DSITE_MAIL_RC=\"@SITE_MAIL_RC@\"
 
 bin_PROGRAMS = mail

@@ -4,18 +4,20 @@
 
 AUTOMAKE_OPTIONS = ../lib/ansi2knr
 
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox/include -I${top_srcdir}/lib
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox/include -I${top_srcdir}/include/mailutils/gnu
 AM_CFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\"
 
 SUBDIRS = include testsuite
 
 lib_LTLIBRARIES = libmailbox.la
 
-EXTRA_DIST = mbx_mboxscan.c md5.h strtok_r.c \
+EXTRA_DIST = mbx_mboxscan.c strtok_r.c \
  strndup.c strnlen.c strchrnul.c argp-ba.c argp-eexst.c \
  argp-fmtstream.c argp-fs-xinl.c argp-help.c argp-parse.c argp-pv.c \
  argp-pvh.c argp-xinl.c getline.c
 
+noinst_HEADERS=argp-fmtstream.h argp-namefrob.h getline.h md5.h
+
 libmailbox_la_SOURCES = \
 address.c \
 argcv.c \