Imported Debian patch 0.84-2debian/0.84-2

7 files changed, 451 insertions, 246 deletions

diff --git a/include/config.h b/include/config.h
new file mode 100644
index 0000000..ed6a027
--- /dev/null
+++ b/include/config.h
@@ -0,0 +1,298 @@
+/* include/config.h.  Generated automatically by configure.  */
+#ifndef SANE_CONFIG_H
+#define SANE_CONFIG_H
+
+/* Define if on AIX 3.
+   System headers sometimes define this.
+   We just want to avoid a redefinition error message.  */
+#ifndef _ALL_SOURCE
+/* #undef _ALL_SOURCE */
+#endif
+
+/* Define if using alloca.c.  */
+/* #undef C_ALLOCA */
+
+/* Define to empty if the keyword does not work.  */
+/* #undef const */
+
+/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
+   This function is required for alloca.c support on those systems.  */
+/* #undef CRAY_STACKSEG_END */
+
+/* Define if you have alloca, as a function or macro.  */
+#define HAVE_ALLOCA 1
+
+/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
+#define HAVE_ALLOCA_H 1
+
+/* Define if you have a working `mmap' system call.  */
+#define HAVE_MMAP 1
+
+/* Define as __inline if that's what the C compiler calls it.  */
+/* #undef inline */
+
+/* Define if on MINIX.  */
+/* #undef _MINIX */
+
+/* Define to `long' if <sys/types.h> doesn't define.  */
+/* #undef off_t */
+
+/* Define if the system does not provide POSIX.1 features except
+   with this defined.  */
+/* #undef _POSIX_1_SOURCE */
+
+/* Define if you need to in order for stat and other things to work.  */
+/* #undef _POSIX_SOURCE */
+
+/* Define to `unsigned' if <sys/types.h> doesn't define.  */
+/* #undef size_t */
+
+/* Define to `unsigned char' if <sys/types.h> doesn't define.  */
+/* #undef u_char */
+
+/* Define to `unsigned int' if <sys/types.h> doesn't define.  */
+/* #undef u_int */
+
+/* Define to `unsigned long' if <sys/types.h> doesn't define.  */
+/* #undef u_long */
+
+/* Define to `long' if <sys/types.h> doesn't define.  */
+/* #undef ssize_t */
+
+/* Define to `int' if <sys/types.h> doesn't define.  */
+/* #undef pid_t */
+
+/* Define scsireq_t as `struct scsireq' if necessary.  */
+/* #undef scsireq_t */
+
+/* Define to the return type of signal handlers. */
+#define RETSIGTYPE void
+
+/* If using the C implementation of alloca, define if you know the
+   direction of stack growth for your system; otherwise it will be
+   automatically deduced at run-time.
+	STACK_DIRECTION > 0 => grows toward higher addresses
+	STACK_DIRECTION < 0 => grows toward lower addresses
+	STACK_DIRECTION = 0 => direction of growth unknown
+ */
+/* #undef STACK_DIRECTION */
+
+/* Define if you have the ANSI C header files.  */
+#define STDC_HEADERS 1
+
+/* Define to 1 if NLS is requested.  */
+#define ENABLE_NLS 1
+
+/* Define as 1 if you have catgets and don't want to use GNU gettext.  */
+/* #undef HAVE_CATGETS */
+
+/* Define as 1 if you have gettext and don't want to use GNU gettext.  */
+#define HAVE_GETTEXT 1
+
+/* Define if your locale.h file contains LC_MESSAGES.  */
+#define HAVE_LC_MESSAGES 1
+
+/* Define to 1 if you have the stpcpy function.  */
+#define HAVE_STPCPY 1
+
+/* Define to the name of the distribution.  */
+#define PACKAGE "xsane"
+
+/* The concatenation of the strings PACKAGE, "-", and VERSION.  */
+#define PACKAGE_VERSION "xsane-0.84"
+
+/* Define to the version of the distribution.  */
+#define VERSION "0.84"
+
+/* Define if you have the __argz_count function.  */
+#define HAVE___ARGZ_COUNT 1
+
+/* Define if you have the __argz_next function.  */
+#define HAVE___ARGZ_NEXT 1
+
+/* Define if you have the __argz_stringify function.  */
+#define HAVE___ARGZ_STRINGIFY 1
+
+/* Define if you have the atexit function. */
+#define HAVE_ATEXIT 1
+
+/* Define if you have the dcgettext function.  */
+#define HAVE_DCGETTEXT 1
+
+/* Define if you have the getcwd function.  */
+#define HAVE_GETCWD 1
+
+/* Define if you have the getpagesize function.  */
+#define HAVE_GETPAGESIZE 1
+
+/* Define if you have the lstat function.  */
+#define HAVE_LSTAT 1
+
+/* Define if you have the mkdir function.  */
+#define HAVE_MKDIR 1
+
+/* Define if you have the munmap function.  */
+#define HAVE_MUNMAP 1
+
+/* Define if you have the putenv function.  */
+#define HAVE_PUTENV 1
+
+/* Define if you have the scsireq_enter function.  */
+/* #undef HAVE_SCSIREQ_ENTER */
+
+/* Define if you have the sigprocmask function.  */
+#define HAVE_SIGPROCMASK 1
+
+/* Define if you have the setenv function.  */
+#define HAVE_SETENV 1
+
+/* Define if you have the setlocale function.  */
+#define HAVE_SETLOCALE 1
+
+/* Define if you have the snprintf function.  */
+#define HAVE_SNPRINTF 1
+
+/* Define if you have the stpcpy function.  */
+#define HAVE_STPCPY 1
+
+/* Define if you have the strcasecmp function.  */
+#define HAVE_STRCASECMP 1
+
+/* Define if you have the strchr function.  */
+#define HAVE_STRCHR 1
+
+/* Define if you have the strdup function.  */
+#define HAVE_STRDUP 1
+
+/* Define if you have the strncasecmp function.  */
+#define HAVE_STRNCASECMP 1
+
+/* Define if you have the strndup function.  */
+#define HAVE_STRNDUP 1
+
+/* Define if you have the strftime function.  */
+#define HAVE_STRFTIME 1
+
+/* Define if you have the strstr function.  */
+#define HAVE_STRSTR 1
+
+/* Define if you have the strsep function.  */
+#define HAVE_STRSEP 1
+
+/* Define if you have the strtod function.  */
+#define HAVE_STRTOD 1
+
+/* Define if you have the valloc function.  */
+/* #undef HAVE_VALLOC */
+
+/* Ignore HAVE_USLEEP under Apollo Domain because the usleep()
+   implementation in the Sys5.3 environment is broken.  */
+#ifndef apollo
+  /* Define if you have the usleep function.  */
+# define HAVE_USLEEP 1
+#endif
+
+/* Define if you have the <argz.h> header file.  */
+#define HAVE_ARGZ_H 1
+
+/* Define if you have the <fcntl.h> header file.  */
+#define HAVE_FCNTL_H 1
+
+/* Define if you have the <libintl.h> header file.  */
+/* #undef HAVE_LIBINTL_H */
+
+/* Define if you have the <libc.h> header file.  */
+/* #undef HAVE_LIBC_H */
+
+/* Define if you have the <limits.h> header file.  */
+#define HAVE_LIMITS_H 1
+
+/* Define if you have the <locale.h> header file.  */
+#define HAVE_LOCALE_H 1
+
+/* Define if you have the <malloc.h> header file.  */
+#define HAVE_MALLOC_H 1
+
+/* Define if you have the <nl_types.h> header file.  */
+#define HAVE_NL_TYPES_H 1
+
+/* Define if you have the <string.h> header file.  */
+#define HAVE_STRING_H 1
+
+/* Define if you have the <sys/select.h> header file. */
+/* #undef HAVE_SYS_SELECT_H */
+
+/* Define if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
+
+/* Define if you have the <sys/io.h> header file. */
+/* #undef HAVE_SYS_IO_H */
+
+/* Define if you have the <asm/io.h> header file. */
+/* #undef HAVE_ASM_IO_H */
+
+/* Define if you have the <scsi.h> header file. */
+/* #undef HAVE_SCSI_H */
+
+/* Define if you have the <scsi/sg.h> header file. */
+/* #undef HAVE_SCSI_SG_H */
+
+/* Define if you have the "/usr/src/linux/include/scsi/sg.h" header file. */
+/* #undef HAVE__USR_SRC_LINUX_INCLUDE_SCSI_SG_H */
+
+/* Define if you have the <sys/dsreq.h> header file. */
+/* #undef HAVE_SYS_DSREQ_H */
+
+/* Define if you have the <os2.h> header file.  */
+/* #undef HAVE_OS2_H */
+
+/* Define if you have sys/types.h. OS/2 wants them before select.h, etc. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define if you have the <unistd.h> header file.  */
+#define HAVE_UNISTD_H 1
+
+/* Define if you have the <values.h> header file.  */
+#define HAVE_VALUES_H 1
+
+/* Define if you have the i library (-li).  */
+/* #undef HAVE_LIBI */
+
+/* Define if you have the intl library (-lintl).  */
+/* #undef HAVE_LIBINTL */
+
+/* Define if you have the m library (-lm).  */
+#define HAVE_LIBM 1
+
+/* Define if you have the <dlfcn.h> header file.  */
+/* #undef HAVE_DLFCN_H */
+
+/* Define if you have the GIMP header files and library.  */
+#define HAVE_LIBGIMP_GIMP_H 1
+
+/* Define if you have the GIMPfeatures header file.  */
+#define HAVE_LIBGIMP_GIMPFEATURES_H 1
+
+/* Define if you have libjpeg.  */
+#define HAVE_LIBJPEG 1
+
+/* Define if you have libz.  */
+#define HAVE_LIBZ 1
+
+/* Define if you have libpng.  */
+#define HAVE_LIBPNG 1
+
+/* Define if you have libtiff.  */
+#define HAVE_LIBTIFF 1
+
+#ifndef HAVE_STRNCASECMP
+  /* OS/2 needs this */
+# define strncasecmp(a, b, c) strnicmp(a, b, c)
+#endif
+
+#if defined (__sun) && defined (__GNUC__)
+# define _POSIX_SOURCE
+# define __EXTENSIONS__
+#endif
+
+#endif /* SANE_CONFIG_H */
diff --git a/include/sane/config.h.in b/include/config.h.in
index 28fffdc..16a6f57 100644
--- a/include/sane/config.h.in
+++ b/include/config.h.in
@@ -112,6 +112,9 @@
 /* Define if you have the __argz_stringify function.  */
 #undef HAVE___ARGZ_STRINGIFY
 
+/* Define if you have the atexit function. */
+#undef HAVE_ATEXIT
+
 /* Define if you have the dcgettext function.  */
 #undef HAVE_DCGETTEXT
 
@@ -121,11 +124,8 @@
 /* Define if you have the getpagesize function.  */
 #undef HAVE_GETPAGESIZE
 
-/* Define if you have the atexit function. */
-#undef HAVE_ATEXIT
-
-/* Define if you have the ioperm function. */
-#undef HAVE_IOPERM
+/* Define if you have the lstat function.  */
+#undef HAVE_LSTAT
 
 /* Define if you have the mkdir function.  */
 #undef HAVE_MKDIR
@@ -148,6 +148,9 @@
 /* Define if you have the setlocale function.  */
 #undef HAVE_SETLOCALE
 
+/* Define if you have the snprintf function.  */
+#undef HAVE_SNPRINTF
+
 /* Define if you have the stpcpy function.  */
 #undef HAVE_STPCPY
 
@@ -181,9 +184,6 @@
 /* Define if you have the valloc function.  */
 #undef HAVE_VALLOC
 
-/* Define if you have the snprintf function.  */
-#undef HAVE_SNPRINTF
-
 /* Ignore HAVE_USLEEP under Apollo Domain because the usleep()
    implementation in the Sys5.3 environment is broken.  */
 #ifndef apollo
@@ -242,45 +242,9 @@
 /* Define if you have the <sys/dsreq.h> header file. */
 #undef HAVE_SYS_DSREQ_H
 
-/* Define if you have the <sys/scsi.h> header file. */
-#undef HAVE_SYS_SCSI_H
-
-/* Define if you have the <sys/scsi/targets/scgio.h> header file. */
-#undef HAVE_SYS_SCSI_TARGETS_SCGIO_H
-
-/* Define if you have the <sys/scsi/sgdefs.h> header file. */
-#undef HAVE_SYS_SCSI_SGDEFS_H
-
-/* Define if you have the <sys/scsicmd.h> header file. */
-#undef HAVE_SYS_SCSICMD_H
-
-/* Define if you have the <sys/scsiio.h> header file. */
-#undef HAVE_SYS_SCSIIO_H
-
-/* Define if you have the <sys/scanio.h> header file. */
-#undef HAVE_SYS_SCANIO_H
-
-/* Define if you have the <apollo/scsi.h> header file. */
-#undef HAVE_APOLLO_SCSI_H
-
-/* Define if you have the <bsd/dev/scsireg.h> header file. */
-#undef HAVE_BSD_DEV_SCSIREG_H
-
-/* Define if you have the <io/cam/cam.h> header file. */
-#undef HAVE_IO_CAM_CAM_H
-
-/* Define if you have the <camlib.h> header file. */
-#undef HAVE_CAMLIB_H
-
-/* Define if you have the <gscdds.h> header file. */
-#undef HAVE_GSCDDS_H
-
 /* Define if you have the <os2.h> header file.  */
 #undef HAVE_OS2_H
 
-/* Define if you have EMX's sys/hw.h headers. */
-#undef HAVE_SYS_HW_H
-
 /* Define if you have sys/types.h. OS/2 wants them before select.h, etc. */
 #undef HAVE_SYS_TYPES_H
 
@@ -302,15 +266,6 @@
 /* Define if you have the <dlfcn.h> header file.  */
 #undef HAVE_DLFCN_H
 
-/* Define if you have the dlopen function.  */
-#undef HAVE_DLOPEN
-
-/* Define if you have the <dl.h> header file.  */
-#undef HAVE_DL_H
-
-/* Define if you have the shl_load function.  */
-#undef HAVE_SHL_LOAD
-
 /* Define if you have the GIMP header files and library.  */
 #undef HAVE_LIBGIMP_GIMP_H
 
diff --git a/include/md5.h b/include/md5.h
new file mode 100644
index 0000000..0290521
--- /dev/null
+++ b/include/md5.h
@@ -0,0 +1,145 @@
+/* md5.h - Declaration of functions and data types used for MD5 sum
+   computing library functions.
+   Copyright (C) 1995, 1996, 1999 Free Software Foundation, Inc.
+   NOTE: The canonical source of this file is maintained with the GNU C
+   Library.  Bugs can be reported to bug-glibc@prep.ai.mit.edu.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, 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 General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifndef _MD5_H
+#define _MD5_H 1
+
+#include <stdio.h>
+
+#if defined HAVE_LIMITS_H || _LIBC
+# include <limits.h>
+#endif
+
+/* The following contortions are an attempt to use the C preprocessor
+   to determine an unsigned integral type that is 32 bits wide.  An
+   alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
+   doing that would require that the configure script compile and *run*
+   the resulting executable.  Locally running cross-compiled executables
+   is usually not possible.  */
+
+#ifdef _LIBC
+# include <sys/types.h>
+typedef u_int32_t md5_uint32;
+#else
+# if defined __STDC__ && __STDC__
+#  define UINT_MAX_32_BITS 4294967295U
+# else
+#  define UINT_MAX_32_BITS 0xFFFFFFFF
+# endif
+
+/* If UINT_MAX isn't defined, assume it's a 32-bit type.
+   This should be valid for all systems GNU cares about because
+   that doesn't include 16-bit systems, and only modern systems
+   (that certainly have <limits.h>) have 64+-bit integral types.  */
+
+# ifndef UINT_MAX
+#  define UINT_MAX UINT_MAX_32_BITS
+# endif
+
+# if UINT_MAX == UINT_MAX_32_BITS
+typedef unsigned int md5_uint32;
+# else
+#  if USHRT_MAX == UINT_MAX_32_BITS
+typedef unsigned short md5_uint32;
+#  else
+#   if ULONG_MAX == UINT_MAX_32_BITS
+typedef unsigned long md5_uint32;
+#   else
+     /* The following line is intended to evoke an error.
+        Using #error is not portable enough.  */
+"Cannot determine unsigned 32-bit data type."
+#   endif
+#  endif
+# endif
+#endif
+#undef __P
+#if defined (__STDC__) && __STDC__
+#define	__P(x) x
+#else
+#define	__P(x) ()
+#endif
+/* Structure to save state of computation between the single steps.  */
+  struct md5_ctx
+{
+  md5_uint32 A;
+  md5_uint32 B;
+  md5_uint32 C;
+  md5_uint32 D;
+
+  md5_uint32 total[2];
+  md5_uint32 buflen;
+  char buffer[128];
+};
+
+/*
+ * The following three functions are build up the low level used in
+ * the functions `md5_stream' and `md5_buffer'.
+ */
+
+/* Initialize structure containing state of computation.
+   (RFC 1321, 3.3: Step 3)  */
+extern void md5_init_ctx __P ((struct md5_ctx * ctx));
+
+/* Starting with the result of former calls of this function (or the
+   initialization function update the context for the next LEN bytes
+   starting at BUFFER.
+   It is necessary that LEN is a multiple of 64!!! */
+extern void md5_process_block __P ((const void *buffer, size_t len,
+				    struct md5_ctx * ctx));
+
+/* Starting with the result of former calls of this function (or the
+   initialization function update the context for the next LEN bytes
+   starting at BUFFER.
+   It is NOT required that LEN is a multiple of 64.  */
+extern void md5_process_bytes __P ((const void *buffer, size_t len,
+				    struct md5_ctx * ctx));
+
+/* Process the remaining bytes in the buffer and put result from CTX
+   in first 16 bytes following RESBUF.  The result is always in little
+   endian byte order, so that a byte-wise output yields to the wanted
+   ASCII representation of the message digest.
+
+   IMPORTANT: On some systems it is required that RESBUF be correctly
+   aligned for a 32 bits value.  */
+extern void *md5_finish_ctx __P ((struct md5_ctx * ctx, void *resbuf));
+
+
+/* Put result from CTX in first 16 bytes following RESBUF.  The result is
+   always in little endian byte order, so that a byte-wise output yields
+   to the wanted ASCII representation of the message digest.
+
+   IMPORTANT: On some systems it is required that RESBUF is correctly
+   aligned for a 32 bits value.  */
+extern void *md5_read_ctx __P ((const struct md5_ctx * ctx, void *resbuf));
+
+
+/* Compute MD5 message digest for bytes read from STREAM.  The
+   resulting message digest number will be written into the 16 bytes
+   beginning at RESBLOCK.  */
+extern int md5_stream __P ((FILE * stream, void *resblock));
+
+/* Compute MD5 message digest for LEN bytes beginning at BUFFER.  The
+   result is always in little endian byte order, so that a byte-wise
+   output yields to the wanted ASCII representation of the message
+   digest.  */
+extern void *md5_buffer
+__P ((const char *buffer, size_t len, void *resblock));
+
+#endif
diff --git a/include/sane/sanei_backend.h b/include/sane/sanei_backend.h
deleted file mode 100644
index 588e2d0..0000000
--- a/include/sane/sanei_backend.h
+++ /dev/null
@@ -1,116 +0,0 @@
-#include <sane/sanei_debug.h>
-
-#ifdef HAVE_SYS_HW_H
-  /* OS/2 i/o-port access compatibility macros: */
-# define inb(p)		_inp8 (p)
-# define outb(v,p)	_outp8 ((p),(v))
-# define ioperm(b,l,o)	_portaccess ((b),(b)+(l)-1)
-# define HAVE_IOPERM	1
-#endif
-
-#ifndef O_NONBLOCK
-# ifdef O_NDELAY
-#  define O_NONBLOCK O_NDELAY
-# else
-#  define O_NONBLOCK FNDELAY	/* last resort */
-# endif
-#endif
-
-#ifndef __GLIBC__
-# ifndef u_int8_t
-#  define u_int8_t	unsigned char
-# endif
-# ifndef u_int16_t
-#  define u_int16_t	unsigned short
-# endif
-# ifndef u_int32_t
-#  define u_int32_t	unsigned int
-# endif
-#endif
-
-#ifdef HAVE_SIGPROCMASK
-# define SIGACTION	sigaction
-#else
-
-/* Just enough backwards compatibility that we get by in the backends
-   without making handstands.  */
-# ifdef sigset_t
-#  undef sigset_t
-# endif
-# ifdef sigemptyset
-#  undef sigemptyset
-# endif
-# ifdef sigfillset
-#  undef sigfillset
-# endif
-# ifdef sigaddset
-#  undef sigaddset
-# endif
-# ifdef sigdelset
-#  undef sigdelset
-# endif
-# ifdef sigprocmask
-#  undef sigprocmask
-# endif
-# ifdef SIG_BLOCK
-#  undef SIG_BLOCK
-# endif
-# ifdef SIG_UNBLOCK
-#  undef SIG_UNBLOCK
-# endif
-# ifdef SIG_SETMASK
-#  undef SIG_SETMASK
-# endif
-
-# define sigset_t		int
-# define sigemptyset(set)	do { *(set) = 0; } while (0)
-# define sigfillset(set)	do { *(set) = ~0; } while (0)
-# define sigaddset(set,signal)	do { *(set) |= sigmask (signal); } while (0)
-# define sigdelset(set,signal)	do { *(set) &= ~sigmask (signal); } while (0)
-# define sigaction(sig,new,old)	sigvec (sig,new,old)
-
-  /* Note: it's not safe to just declare our own "struct sigaction" since
-     some systems (e.g., some versions of OpenStep) declare that structure,
-     but do not implement sigprocmask().  Hard to believe, aint it?  */
-# define SIGACTION		sigvec
-# define SIG_BLOCK	1
-# define SIG_UNBLOCK	2
-# define SIG_SETMASK	3
-#endif /* !HAVE_SIGPROCMASK */
-
-/* Declare the entry points: */
-
-extern SANE_Status ENTRY(init) (SANE_Int *, SANE_Auth_Callback);
-extern SANE_Status ENTRY(get_devices) (const SANE_Device ***, SANE_Bool);
-extern SANE_Status ENTRY(open) (SANE_String_Const, SANE_Handle *);
-extern const SANE_Option_Descriptor *
-  ENTRY(get_option_descriptor) (SANE_Handle, SANE_Int);
-extern SANE_Status ENTRY(control_option) (SANE_Handle, SANE_Int, SANE_Action,
-					  void *, SANE_Word *);
-extern SANE_Status ENTRY(get_parameters) (SANE_Handle, SANE_Parameters *);
-extern SANE_Status ENTRY(start) (SANE_Handle);
-extern SANE_Status ENTRY(read) (SANE_Handle, SANE_Byte *, SANE_Int,
-				SANE_Int *);
-extern SANE_Status ENTRY(set_io_mode) (SANE_Handle, SANE_Bool);
-extern SANE_Status ENTRY(get_select_fd) (SANE_Handle, SANE_Int *);
-extern void ENTRY(cancel) (SANE_Handle);
-extern void ENTRY(close) (SANE_Handle);
-extern void ENTRY(exit) (void);
-
-#ifndef STUBS
-/* Now redirect sane_* calls to backend's functions: */
-
-#define sane_init(a,b)			ENTRY(init) (a,b)
-#define sane_get_devices(a,b)		ENTRY(get_devices) (a,b)
-#define sane_open(a,b)			ENTRY(open) (a,b)
-#define sane_get_option_descriptor(a,b)	ENTRY(get_option_descriptor) (a,b)
-#define sane_control_option(a,b,c,d,e)	ENTRY(control_option) (a,b,c,d,e)
-#define sane_get_parameters(a,b)	ENTRY(get_parameters) (a,b)
-#define sane_start(a)			ENTRY(start) (a)
-#define sane_read(a,b,c,d)		ENTRY(read) (a,b,c,d)
-#define sane_set_io_mode(a,b)		ENTRY(set_io_mode) (a,b)
-#define sane_get_select_fd(a,b)		ENTRY(get_select_fd) (a,b)
-#define sane_cancel(a)			ENTRY(cancel) (a)
-#define sane_close(a)			ENTRY(close) (a)
-#define sane_exit(a)			ENTRY(exit) (a)
-#endif /* STUBS */
diff --git a/include/sane/sanei_config.h b/include/sane/sanei_config.h
deleted file mode 100644
index ac64007..0000000
--- a/include/sane/sanei_config.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* sane - Scanner Access Now Easy.
-   Copyright (C) 1997 Jeffrey S. Freedman
-   This file is part of the SANE package.
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 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
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
-
-   As a special exception, the authors of SANE give permission for
-   additional uses of the libraries contained in this release of SANE.
-
-   The exception is that, if you link a SANE library with other files
-   to produce an executable, this does not by itself cause the
-   resulting executable to be covered by the GNU General Public
-   License.  Your use of that executable is in no way restricted on
-   account of linking the SANE library code into it.
-
-   This exception does not, however, invalidate any other reasons why
-   the executable file might be covered by the GNU General Public
-   License.
-
-   If you submit changes to SANE to the maintainers to be included in
-   a subsequent release, you agree by submitting the changes that
-   those changes may be distributed with this exception intact.
-
-   If you write modifications of your own for SANE, it is your choice
-   whether to permit this exception to apply to your modifications.
-   If you do not wish that, delete this exception notice.
-
-   This file provides generic configuration support.  */
-
-#ifndef sanei_config_h
-
-#include <stdio.h>
-
-extern FILE *sanei_config_open (const char *name);
-extern const char *sanei_config_skip_whitespace (const char *str);
-/* Scan a string constant from the string pointed to by STR and return
-   a malloced copy of it in *STRING_CONST (it's the responsibility of
-   the caller to free the returned string at an appropriate time).
-   Whitespace in front of the string constant is ignored.  Whitespace
-   can be included in the string constant by enclosing it in
-   double-quotes.  A return val of NULL indicates that no string
-   constant was found. */
-extern const char *sanei_config_get_string (const char *str,
-					    char **string_const);
-
-/* A convenience function to support expanding device name patterns
-   into a list of devices.  Apart from a normal device name
-   (such as /dev/sdb), this function currently supports SCSI
-   device specifications of the form:
-
-	scsi VENDOR MODEL TYPE BUS CHANNEL ID LUN
-
-   Where VENDOR is the desired vendor name.  MODEL is the desired
-   MODEL name.  TYPE is the desired device type.  All of these can be
-   set to * to match anything.  To include whitespace in these
-   strings, enclose them in double-quotes (").  BUS, ID, and LUN are
-   the desired SCSI bus, id, and logical-unit numbers.  These can be
-   set to * or simply omitted to match anything.  */
-extern void sanei_config_attach_matching_devices (const char *name,
-						  SANE_Status (*attach)
-						    (const char *dev));
-
-#endif	/* sanei_config_h */
diff --git a/include/sane/stamp-h b/include/sane/stamp-h
deleted file mode 100644
index 9788f70..0000000
--- a/include/sane/stamp-h
+++ /dev/null
@@ -1 +0,0 @@
-timestamp
diff --git a/include/sane/sanei_signal.h b/include/sanei_signal.h
index 0033c1c..0033c1c 100644
--- a/include/sane/sanei_signal.h
+++ b/include/sanei_signal.h