--- ./groebner/src/nf.h.orig	2011-04-27 05:00:31.000000000 -0600
+++ ./groebner/src/nf.h	2011-06-17 13:34:00.506457539 -0600
@@ -12,7 +12,7 @@
 #include "groebner_alg.h"
 #if HAVE_M4RI
 extern "C"{
-#include "m4ri/m4ri.h"
+#include <m4ri/m4ri.h>
 }
 #endif
 #ifndef PBORI_GB_NF_H
--- ./groebner/src/nf.cc.orig	2011-04-27 05:00:31.000000000 -0600
+++ ./groebner/src/nf.cc	2011-06-17 13:34:24.528457537 -0600
@@ -63,7 +63,7 @@
 
 static int log2_floor(int n){
     int i;
-    for(i=0;TWOPOW(i)<=n;i++){}
+    for(i=0;__M4RI_TWOPOW(i)<=n;i++){}
     return i-1;
 }
 static int optimal_k_for_multiplication(int a,int b,int c,const GroebnerStrategy& strat){
--- ./PyPolyBoRi/main_wrapper.cc.orig	2011-04-27 05:00:31.000000000 -0600
+++ ./PyPolyBoRi/main_wrapper.cc	2011-06-17 13:34:00.506457539 -0600
@@ -22,8 +22,9 @@
 #ifdef HAVE_M4RI
 #define PACKED 1
 extern "C"{
-#include "m4ri/packedmatrix.h"
-#include "m4ri/grayflex.h"
+#include <m4ri/misc.h>
+#include <m4ri/packedmatrix.h>
+#include <m4ri/grayflex.h>
 }
 
 #endif