diff -Naur --exclude='.*' --exclude='*.o' xf86-input-evtouch-0.8.7/evtouch.c xf86-input-evtouch-0.8.7.working/evtouch.c
--- xf86-input-evtouch-0.8.7/evtouch.c	2008-12-26 09:47:24.000000000 +0100
+++ xf86-input-evtouch-0.8.7.working/evtouch.c	2008-12-26 09:39:12.000000000 +0100
@@ -605,7 +595,7 @@
         DBGOUT(2, "EVTouch: %s btn_count=%d\n", __FUNCTION__, 
                priv->btn_count);
         priv->btn_actions = xcalloc(priv->btn_count, sizeof(BtnAction));
-        xf86memset(priv->btn_actions, 0, 
+        memset(priv->btn_actions, 0, 
                    priv->btn_count * sizeof(BtnAction));
         
         DBGOUT(2, "EVTouch: %s btn_count=%d\n", __FUNCTION__, 
@@ -708,7 +698,7 @@
 static void
 EVTouchNewPacket (EVTouchPrivatePtr priv)
 {
-        xf86memset(&priv->ev, 0, sizeof(struct input_event));
+        memset(&priv->ev, 0, sizeof(struct input_event));
         priv->packeti = 0;
         priv->binary_pkt = FALSE;
 }
diff -Naur --exclude='.*' --exclude='*.o' xf86-input-evtouch-0.8.7/libtouch.c xf86-input-evtouch-0.8.7.working/libtouch.c
--- xf86-input-evtouch-0.8.7/libtouch.c	2008-12-26 09:47:24.000000000 +0100
+++ xf86-input-evtouch-0.8.7.working/libtouch.c	2008-12-26 09:19:13.000000000 +0100
@@ -34,7 +34,6 @@
 #ifndef NEED_XF86_TYPES
 #define NEED_XF86_TYPES
 #endif
-#include <xf86_ansic.h>
 #include <xf86_OSproc.h>
 #include <xf86Xinput.h>
 #include <exevents.h>
@@ -196,7 +195,7 @@
         int btn;
         char *str;
 
-        xf86memset(libtouch, 0, sizeof(LibTouchRec));
+        memset(libtouch, 0, sizeof(LibTouchRec));
 
         libtouch->now = GetTimeInMillis();
         libtouch->past = libtouch->now;