--- valgrind-3.7.0/include/vki/vki-amd64-linux.h.orig	2011-11-24 17:34:00.350324779 -0200
+++ valgrind-3.7.0/include/vki/vki-amd64-linux.h	2011-11-24 17:34:09.820324787 -0200
@@ -316,6 +316,9 @@ struct vki_stat {
 	long		st_blksize;
 	long		st_blocks;	/* Number 512-byte blocks allocated. */
 
+#undef st_atime
+#undef st_mtime
+#undef st_ctime
 	unsigned long	st_atime;
 	unsigned long 	st_atime_nsec; 
 	unsigned long	st_mtime;
--- valgrind-3.7.0/include/vki/vki-ppc32-linux.h.orig	2011-11-24 17:34:45.304324760 -0200
+++ valgrind-3.7.0/include/vki/vki-ppc32-linux.h	2011-11-24 17:35:00.213324757 -0200
@@ -398,6 +398,9 @@ struct vki_stat {
    long			st_size;
    unsigned long	st_blksize;
    unsigned long	st_blocks;
+#undef st_atime
+#undef st_mtime
+#undef st_ctime
    unsigned long	st_atime;
    unsigned long	st_atime_nsec;
    unsigned long	st_mtime;
--- valgrind-3.7.0/include/vki/vki-ppc64-linux.h.orig	2011-11-24 17:35:10.453324749 -0200
+++ valgrind-3.7.0/include/vki/vki-ppc64-linux.h	2011-11-24 17:35:21.707324703 -0200
@@ -434,6 +434,9 @@ struct vki_stat {
   long            st_size;
   unsigned long   st_blksize;
   unsigned long   st_blocks;
+#undef st_atime
+#undef st_mtime
+#undef st_ctime
   unsigned long   st_atime;
   unsigned long   st_atime_nsec;
   unsigned long   st_mtime;
--- valgrind-3.7.0/include/vki/vki-x86-linux.h.orig	2011-11-24 17:34:25.817324769 -0200
+++ valgrind-3.7.0/include/vki/vki-x86-linux.h	2011-11-24 17:34:35.927324798 -0200
@@ -354,6 +354,9 @@ struct vki_stat {
 	unsigned long  st_size;
 	unsigned long  st_blksize;
 	unsigned long  st_blocks;
+#undef st_atime
+#undef st_mtime
+#undef st_ctime
 	unsigned long  st_atime;
 	unsigned long  st_atime_nsec;
 	unsigned long  st_mtime;