--- source/libnormaliz/HilbertSeries.cpp.orig	2015-01-22 15:22:34.000000000 -0700
+++ source/libnormaliz/HilbertSeries.cpp	2016-02-05 12:40:21.607850883 -0700
@@ -355,7 +355,7 @@ void HilbertSeries::computeHilbertQuasiP
     //divide by gcd //TODO operate directly on vector
     Matrix<mpz_class> QP(quasi_poly);
     mpz_class g = QP.matrix_gcd();
-    g = gcd(g,quasi_denom);
+    g = libnormaliz::gcd(g,quasi_denom);
     quasi_denom /= g;
     QP.scalar_division(g);
     quasi_poly = QP.get_elements();
--- source/libnormaliz/matrix.cpp.orig	2015-01-22 15:22:34.000000000 -0700
+++ source/libnormaliz/matrix.cpp	2016-02-05 12:42:19.281313552 -0700
@@ -638,7 +638,7 @@ Integer Matrix<Integer>::matrix_gcd() co
     Integer g=0,h;
     for (size_t i = 0; i <nr; i++) {
         h = v_gcd(elements[i]);
-        g = gcd<Integer>(g, h);
+        g = libnormaliz::gcd<Integer>(g, h);
         if (g==1) return g;
     }
     return g;
@@ -1210,7 +1210,7 @@ vector<Integer> Matrix<Integer>::solve(c
             return vector<Integer>();
         }
     }
-    Integer total_gcd =gcd(denom,v_gcd(Linear_Form)); // extract the gcd of denom and solution
+    Integer total_gcd =libnormaliz::gcd(denom,v_gcd(Linear_Form)); // extract the gcd of denom and solution
     denom/=total_gcd;
     v_scalar_division(Linear_Form,total_gcd);
     return Linear_Form;
--- source/libnormaliz/sublattice_representation.cpp.orig	2015-01-22 15:22:34.000000000 -0700
+++ source/libnormaliz/sublattice_representation.cpp	2016-02-05 12:51:56.882519262 -0700
@@ -158,7 +158,7 @@ void Sublattice_Representation<Integer>:
     
     //check if a factor can be extraced from B  //TODO necessary?
     Integer g = B.matrix_gcd();
-    g = gcd(g,c);  //TODO necessary??
+    g = libnormaliz::gcd(g,c);  //TODO necessary??
     if (g > 1) {
         c /= g;
         B.scalar_division(g);
@@ -303,7 +303,7 @@ Matrix<Integer> Sublattice_Representatio
             //new_row cannot be divisible by a factor of m
             //so make_prime divides by an invertible element
             rowgcd = v_make_prime(new_row);  
-            assert(gcd(m,rowgcd) == 1);
+            assert(libnormaliz::gcd(m,rowgcd) == 1);
             new_row[dim] = m;
             Cong2.append(new_row);
         }
--- source/libnormaliz/vector_operations.cpp.orig	2015-01-22 15:22:34.000000000 -0700
+++ source/libnormaliz/vector_operations.cpp	2016-02-05 12:52:30.111828674 -0700
@@ -211,7 +211,7 @@ Integer v_gcd(const vector<Integer>& v){
     size_t i, size=v.size();
     Integer g=0;
     for (i = 0; i < size; i++) {
-        g=gcd(g,v[i]);
+        g=libnormaliz::gcd(g,v[i]);
         if (g==1) {
             return 1;
         }
@@ -226,7 +226,7 @@ Integer v_lcm(const vector<Integer>& v){
     size_t i,size=v.size();
     Integer g=1;
     for (i = 0; i < size; i++) {
-        g=lcm(g,v[i]);
+        g=libnormaliz::lcm(g,v[i]);
         if (g==0) {
             return 0;
         }