Fix build with -Werror, remove some useless #includes and add some others (actually, time.h and sys/time.h were not required since Time is defined in X.h anyway).

(Old svn revision: 24099)