Multiple defines between xserver and x86-input-mouse

[Christopher Blauvelt]

while compiling the modular X on a gentoo system I received the
following errors from mouse.c:
 i686-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I. -I.. -march=pentium-m
-O3 -pipe -funroll-loops -DXFree86Server -DIN_MODULE -DXFree86Module
-DXFree86LOADER -I/usr/include/xorg -I../src -MT mouse.lo -MD -MP -MF
.deps/mouse.Tpo -c mouse.c  -fPIC -DPIC -o .libs/mouse.o
mouse.c:70:1: warning: "NEED_XF86_TYPES" redefined
In file included from ../config.h:4,
                 from mouse.c:49:
/usr/include/xorg/xorg-server.h:75:1: warning: this is the location of
the previous definition
In file included from /usr/include/xorg/xisb.h:32,
                 from mouse.c:74:
/usr/include/unistd.h:189: error: conflicting types for 'xf86ssize_t'
/usr/include/xorg/xf86_libc.h:86: error: previous declaration of
'xf86ssize_t' was here
In file included from /usr/include/xorg/xisb.h:32,
                 from mouse.c:74:
/usr/include/unistd.h:312: error: conflicting types for 'xf86read'
/usr/include/xorg/xf86_ansic.h:273: error: previous declaration of
'xf86read' was here
/usr/include/unistd.h:312: error: conflicting types for 'xf86read'
/usr/include/xorg/xf86_ansic.h:273: error: previous declaration of
'xf86read' was here
/usr/include/unistd.h:318: error: conflicting types for 'xf86write'
/usr/include/xorg/xf86_ansic.h:274: error: previous declaration of
'xf86write' was here
/usr/include/unistd.h:318: error: conflicting types for 'xf86write'
/usr/include/xorg/xf86_ansic.h:274: error: previous declaration of
'xf86write' was here
/usr/include/unistd.h:405: error: conflicting types for 'xf86usleep'
/usr/include/xorg/xf86_ansic.h:345: error: previous declaration of
'xf86usleep' was here
/usr/include/unistd.h:405: error: conflicting types for 'xf86usleep'
/usr/include/xorg/xf86_ansic.h:345: error: previous declaration of
'xf86usleep' was here
In file included from /usr/include/xorg/xisb.h:32,
                 from mouse.c:74:
/usr/include/unistd.h:884:29: macro "getpagesize" passed 1 arguments,
but takes just 0

it seems that some definitions were moved into one file without
removing them from the other but I'm not sure.

Chris